#include "../graphics/Font.h"
#include "../graphics/Frame.h"
#include "../graphics/Texture.h"
+#include "../math/Vector.h"
using app::Input;
using common::Capsule;
using common::Inventory;
using common::Item;
-using geometry::Vector;
+using math::Vector;
using graphics::Font;
using graphics::Frame;
void CapsuleChangeMenu::HandleEvents(const Input &input) {
- if (input.JustPressed(Input::ACTION_B)) {
+ if (input.JustPressed(Input::ACTION_A)
+ || input.JustPressed(Input::ACTION_B)) {
Ctrl().PopState();
}
}
void CapsuleChangeMenu::NextCapsule() {
+ int storedClass = parent->Game().state->GetCapsule().ClassIndex();
int &index = parent->Game().state->capsule;
++index;
index %= parent->Game().state->NumCapsules();
++index;
index %= parent->Game().state->NumCapsules();
}
+ parent->Game().state->GetCapsule().SetClass(storedClass);
}
void CapsuleChangeMenu::PreviousCapsule() {
+ int storedClass = parent->Game().state->GetCapsule().ClassIndex();
int &index = parent->Game().state->capsule;
--index;
if (index < 0) index += parent->Game().state->NumCapsules();
--index;
if (index < 0) index += parent->Game().state->NumCapsules();
}
+ parent->Game().state->GetCapsule().SetClass(storedClass);
}
void CapsuleChangeMenu::NextClass() {
}
-void CapsuleChangeMenu::UpdateWorld(float deltaT) {
+void CapsuleChangeMenu::UpdateWorld(Uint32 deltaT) {
}
Vector<int> target(
cursor.X() + parent->Res().capsuleSelectTopLeft->Width(),
cursor.Y() + numClasses * parent->Res().capsuleSelectLadder->Height());
- parent->Res().capsuleSelectLeftRepeat->Render(screen, cursor, target);
+ parent->Res().capsuleSelectLeftRepeat->Draw(screen, cursor, target);
cursor.Y() = target.Y();
parent->Res().capsuleSelectBottomLeft->Draw(screen, cursor);
cursor.X() += parent->Res().capsuleSelectTopLeft->Width();
target = Vector<int>(
cursor.X() + parent->Res().capsuleSelectTopRight->Width(),
cursor.Y() + numClasses * parent->Res().capsuleSelectLadder->Height());
- parent->Res().capsuleSelectRightRepeat->Render(screen, cursor, target);
+ parent->Res().capsuleSelectRightRepeat->Draw(screen, cursor, target);
cursor.Y() = target.Y();
parent->Res().capsuleSelectBottomRight->Draw(screen, cursor);
}