X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=5c1a27a4ee76a781c4fc79ad1143495ac96bfe36;hb=9718062e6ed305d9f8f1674ff172079688e78088;hp=d66f8b5458dff6fccd822a38d278e6b61ea5a776;hpb=2147d00bbcb43f5cb4499091f646057cb6944cb3;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index d66f8b5..5c1a27a 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -38,7 +38,7 @@ void SelectIkari::ExitState(Application &c, SDL_Surface *screen) {
 void SelectIkari::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::IKARI);
-		battle->ActiveHero().GetAttackChoice().SetItem(battle->GetIkariMenu().Selected());
+		battle->ActiveHero().GetAttackChoice().SetItem(battle->ActiveHero().IkariMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -55,9 +55,9 @@ void SelectIkari::Resize(int width, int height) {
 
 void SelectIkari::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		if (battle->GetIkariMenu().SelectedIsEnabled() && battle->GetIkariMenu().Selected()->HasIkari()) {
+		if (battle->ActiveHero().IkariMenu().SelectedIsEnabled() && battle->ActiveHero().IkariMenu().Selected()->HasIkari()) {
 			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
-			const Ikari *ikari(battle->GetIkariMenu().Selected()->GetIkari());
+			const Ikari *ikari(battle->ActiveHero().IkariMenu().Selected()->GetIkari());
 			ac.Selection().Reset();
 			if (ikari->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
@@ -67,7 +67,7 @@ void SelectIkari::HandleEvents(const Input &input) {
 			if (ikari->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::MAGIC);
 				// TODO: remove item from inventory
-				ac.SetItem(battle->GetIkariMenu().Selected());
+				ac.SetItem(battle->ActiveHero().IkariMenu().Selected());
 				battle->NextHero();
 				ctrl->PopState();
 			} else {
@@ -84,16 +84,16 @@ void SelectIkari::HandleEvents(const Input &input) {
 		ctrl->PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		battle->GetIkariMenu().PreviousRow();
+		battle->ActiveHero().IkariMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		battle->GetIkariMenu().NextItem();
+		battle->ActiveHero().IkariMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		battle->GetIkariMenu().NextRow();
+		battle->ActiveHero().IkariMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		battle->GetIkariMenu().PreviousItem();
+		battle->ActiveHero().IkariMenu().PreviousItem();
 	}
 }
 
@@ -130,7 +130,7 @@ void SelectIkari::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
 	Point<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
-	battle->GetIkariMenu().Draw(screen, position + offset);
+	battle->ActiveHero().IkariMenu().Draw(screen, position + offset);
 }
 
 }