X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.cpp;h=b2cac81e7357330918b501ee75dcf056d5b82d0d;hb=0542849dfccfec1ce1477265fa0fee2401a8fb23;hp=c728db0e61c6bd51502329e2ba7a84026d0fa7c1;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index c728db0..b2cac81 100644
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -7,16 +7,16 @@
 
 #include "SelectMoveAction.h"
 
+#include "RunState.h"
 #include "SelectAttackType.h"
+#include "SwapHeroes.h"
 #include "../BattleState.h"
 #include "../MoveMenu.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
 
 using app::Application;
 using app::Input;
-using geometry::Point;
 using geometry::Vector;
 
 namespace battle {
@@ -43,7 +43,7 @@ void SelectMoveAction::Resize(int width, int height) {
 }
 
 
-void SelectMoveAction::HandleInput(const Input &input) {
+void SelectMoveAction::HandleEvents(const Input &input) {
 	if (input.IsDown(Input::PAD_UP)) {
 		battle->GetMoveMenu().Select(MoveMenu::CHANGE);
 	} else if (input.IsDown(Input::PAD_DOWN)) {
@@ -59,10 +59,10 @@ void SelectMoveAction::HandleInput(const Input &input) {
 				battle->NextHero();
 				break;
 			case MoveMenu::CHANGE:
-				// TODO: switch to change state
+				ctrl->PushState(new SwapHeroes(battle, this));
 				break;
 			case MoveMenu::RUN:
-				// TODO: switch to run state
+				ctrl->ChangeState(new RunState(battle));
 				break;
 		}
 	}
@@ -81,9 +81,9 @@ void SelectMoveAction::Render(SDL_Surface *screen) {
 }
 
 void SelectMoveAction::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(
-			(battle->BackgroundWidth() - battle->GetMoveMenu().Width()) / 2,
-			battle->BackgroundHeight() - battle->GetMoveMenu().Height() - battle->GetMoveMenu().Height() / 2);
+	Vector<int> position(
+			(battle->Width() - battle->GetMoveMenu().Width()) / 2,
+			battle->Height() - battle->GetMoveMenu().Height() - battle->GetMoveMenu().Height() / 2);
 	battle->GetMoveMenu().Render(screen, position + offset);
 }