X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.cpp;h=74e86281c3761097bc75e149e41ce51fed696c7c;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=351116bf0918e4e7aa434fcdc76accd7b412d941;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index 351116b..74e8628 100644
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -17,28 +17,28 @@
 
 using app::Application;
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 
 namespace battle {
 
-void SelectMoveAction::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectMoveAction::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectMoveAction::OnExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectMoveAction::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectMoveAction::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void SelectMoveAction::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectMoveAction::Resize(int width, int height) {
+void SelectMoveAction::OnResize(int width, int height) {
 
 }
 
@@ -55,14 +55,14 @@ void SelectMoveAction::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		switch (battle->GetMoveMenu().Selected()) {
 			case MoveMenu::ATTACK:
-				ctrl->ChangeState(new SelectAttackType(battle));
+				Ctrl().ChangeState(new SelectAttackType(battle));
 				battle->NextHero();
 				break;
 			case MoveMenu::CHANGE:
-				ctrl->PushState(new SwapHeroes(battle, this));
+				Ctrl().PushState(new SwapHeroes(battle, this));
 				break;
 			case MoveMenu::RUN:
-				ctrl->ChangeState(new RunState(battle));
+				Ctrl().ChangeState(new RunState(battle));
 				break;
 		}
 	}