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

diff --git a/src/battle/states/SelectMoveAction.cpp b/src/battle/states/SelectMoveAction.cpp
index b2cac81..bb71487 100644
--- a/src/battle/states/SelectMoveAction.cpp
+++ b/src/battle/states/SelectMoveAction.cpp
@@ -21,24 +21,24 @@ using geometry::Vector;
 
 namespace battle {
 
-void SelectMoveAction::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectMoveAction::OnEnterState(Application &c, SDL_Surface *screen) {
+
 }
 
-void SelectMoveAction::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectMoveAction::OnExitState(Application &c, SDL_Surface *screen) {
+
 }
 
-void SelectMoveAction::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void SelectMoveAction::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectMoveAction::OnPauseState(Application &ctrl, 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;
 		}
 	}