X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=8d2006a4269597802aa287a68cd19341d6082c58;hb=3701b454bd2c868a886ae5287d8209b714649344;hp=87436b0faad8d862a58f82f185013d309a8f4fc9;hpb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 87436b0..8d2006a 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -1,10 +1,3 @@
-/*
- * SelectIkari.cpp
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #include "SelectIkari.h"
 
 #include "SelectAttackType.h"
@@ -15,37 +8,38 @@
 #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::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectIkari::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectIkari::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectIkari::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectIkari::ResumeState(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::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectIkari::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectIkari::Resize(int width, int height) {
+void SelectIkari::OnResize(int width, int height) {
 
 }
 
@@ -62,23 +56,22 @@ void SelectIkari::HandleEvents(const Input &input) {
 				ac.Selection().SelectMonsters();
 			}
 			if (ikari->GetTargetingMode().TargetsAll()) {
-				ac.SetType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
+				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();
@@ -94,7 +87,7 @@ void SelectIkari::HandleEvents(const Input &input) {
 	}
 }
 
-void SelectIkari::UpdateWorld(float deltaT) {
+void SelectIkari::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -119,7 +112,7 @@ void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 	Vector<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight());
-	res.normalFont->DrawString(res.itemMenuHeadline, screen, position + offset);
+	res.normalFont->DrawString(res.ikariMenuHeadline, screen, position + offset);
 }
 
 void SelectIkari::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {