X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=fe6ce7b3ba7dc9fa8e1addc5382883012317e3d0;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=68f844f02994e6b81a736ee61b260ca7fbca29cc;hpb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 68f844f..fe6ce7b 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -23,15 +23,15 @@ using graphics::Frame;
 
 namespace battle {
 
-void SelectItem::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectItem::OnEnterState(Application &c, SDL_Surface *screen) {
+
 }
 
-void SelectItem::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectItem::OnExitState(Application &c, SDL_Surface *screen) {
+
 }
 
-void SelectItem::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectItem::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::ITEM);
 		battle->ActiveHero().GetAttackChoice().SetItem(battle->ItemMenu().Selected());
@@ -39,12 +39,12 @@ void SelectItem::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	}
 }
 
-void SelectItem::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectItem::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
-void SelectItem::Resize(int width, int height) {
+void SelectItem::OnResize(int width, int height) {
 
 }
 
@@ -62,22 +62,21 @@ void SelectItem::HandleEvents(const Input &input) {
 			}
 			if (item->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::ITEM);
-				// TODO: remove item from inventory
 				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();