X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=53d2cbd462dc479578861f5a5a48d8966f101e5e;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=1a36e41c86ed9483e54ac4f7ae7646932eae7aea;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 1a36e41..53d2cbd 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -15,32 +15,33 @@
 #include "../../common/Ikari.h"
 #include "../../common/Item.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;
 using common::Ikari;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectIkari::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectIkari::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectIkari::OnExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectIkari::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectIkari::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectIkari::OnResumeState(SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::IKARI);
 		battle->ActiveHero().GetAttackChoice().SetItem(battle->ActiveHero().IkariMenu().Selected());
-		ctrl.PopState();
+		Ctrl().PopState();
 	}
 }
 
-void SelectIkari::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectIkari::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -65,19 +66,19 @@ void SelectIkari::HandleEvents(const Input &input) {
 				ac.SetType(AttackChoice::IKARI);
 				ac.SetItem(battle->ActiveHero().IkariMenu().Selected());
 				battle->NextHero();
-				ctrl->PopState();
+				Ctrl().PopState();
 			} else {
 				if (ikari->GetTargetingMode().TargetsSingle()) {
 					ac.Selection().SetSingle();
 				} else {
 					ac.Selection().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
+				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
 			}
 		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {
-		ctrl->PopState(); // return control to parent
+		Ctrl().PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
 		battle->ActiveHero().IkariMenu().PreviousRow();
@@ -93,7 +94,7 @@ void SelectIkari::HandleEvents(const Input &input) {
 	}
 }
 
-void SelectIkari::UpdateWorld(float deltaT) {
+void SelectIkari::UpdateWorld(Uint32 deltaT) {
 
 }