X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=b64311640020055369f1d692726799c324d3d302;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=86f11c25bf3e79547671a9cb507ce85c974a2c94;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 86f11c2..b643116 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -18,33 +18,33 @@
 using app::Application;
 using app::Input;
 using common::Item;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectItem::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectItem::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectItem::OnExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectItem::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectItem::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectItem::OnResumeState(SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::ITEM);
 		battle->ActiveHero().GetAttackChoice().SetItem(battle->ItemMenu().Selected());
-		ctrl.PopState();
+		Ctrl().PopState();
 	}
 }
 
-void SelectItem::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectItem::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectItem::Resize(int width, int height) {
+void SelectItem::OnResize(int width, int height) {
 
 }
 
@@ -64,19 +64,19 @@ void SelectItem::HandleEvents(const Input &input) {
 				ac.SetType(AttackChoice::ITEM);
 				ac.SetItem(item);
 				battle->NextHero();
-				ctrl->PopState();
+				Ctrl().PopState();
 			} else {
 				if (item->GetTargetingMode().TargetsSingle()) {
 					ac.Selection().SetSingle();
 				} else {
 					ac.Selection().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().itemTargetCursor));
+				Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().itemTargetCursor));
 			}
 		}
 	}
 	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->ItemMenu().PreviousRow();