X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.cpp;h=8aa49067df121ee223784ddfaec6d3faca050d15;hb=222167ba3722dc7f47ff7510006bd516e0010a50;hp=bee880be88c418135939da8a01c0ee9336eaa792;hpb=2a0eca649009f78028db286a67a532429cab5b88;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index bee880b..8aa4906 100644
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -7,7 +7,9 @@
 
 #include "SelectMoveAction.h"
 
+#include "RunState.h"
 #include "SelectAttackType.h"
+#include "SwapHeroes.h"
 #include "../BattleState.h"
 #include "../MoveMenu.h"
 #include "../../app/Application.h"
@@ -43,7 +45,7 @@ void SelectMoveAction::Resize(int width, int height) {
 }
 
 
-void SelectMoveAction::HandleInput(const app::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 +61,10 @@ void SelectMoveAction::HandleInput(const app::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;
 		}
 	}
@@ -83,7 +85,7 @@ 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() * 3 / 4) - (battle->GetMoveMenu().Height() / 2));
+			battle->BackgroundHeight() - battle->GetMoveMenu().Height() - battle->GetMoveMenu().Height() / 2);
 	battle->GetMoveMenu().Render(screen, position + offset);
 }