X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=97a951d7c82fea11a5f12d3e2eb4d99847127a1e;hb=e27fcf693589ede18b753d5f64f9dfecfe6344bd;hp=7928888d2bb031805d703001be8733336a180e0d;hpb=41983a2cd8dbbfe6adc02cdfccbf5c2887306e51;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 7928888..97a951d 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -36,7 +36,9 @@ void SelectIkari::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectIkari::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroTargets().HasSelected()) {
+	if (battle->ActiveHeroAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHeroAttackChoice().SetType(AttackChoice::IKARI);
+		battle->ActiveHeroAttackChoice().SetItem(battle->GetIkariMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -51,29 +53,29 @@ void SelectIkari::Resize(int width, int height) {
 }
 
 
-void SelectIkari::HandleInput(const Input &input) {
+void SelectIkari::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		if (battle->GetIkariMenu().SelectedIsEnabled() && battle->GetIkariMenu().Selected()->HasIkari()) {
 			const Ikari *ikari(battle->GetIkariMenu().Selected()->GetIkari());
-			battle->ActiveHeroTargets().Reset();
+			battle->ActiveHeroAttackChoice().Selection().Reset();
 			if (ikari->GetTargetingMode().TargetsAlly()) {
-				battle->ActiveHeroTargets().SelectHeroes();
+				battle->ActiveHeroAttackChoice().Selection().SelectHeroes();
 			} else {
-				battle->ActiveHeroTargets().SelectEnemies();
+				battle->ActiveHeroAttackChoice().Selection().SelectEnemies();
 			}
 			if (ikari->GetTargetingMode().TargetsAll()) {
-				battle->SetAttackType(AttackChoice::MAGIC);
+				battle->ActiveHeroAttackChoice().SetType(AttackChoice::MAGIC);
 				// TODO: remove item from inventory
 				battle->ActiveHeroAttackChoice().SetItem(battle->GetIkariMenu().Selected());
 				battle->NextHero();
 				ctrl->PopState();
 			} else {
 				if (ikari->GetTargetingMode().TargetsSingle()) {
-					battle->ActiveHeroTargets().SetSingle();
+					battle->ActiveHeroAttackChoice().Selection().SetSingle();
 				} else {
-					battle->ActiveHeroTargets().SetMultiple();
+					battle->ActiveHeroAttackChoice().Selection().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
+				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroAttackChoice().Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
 			}
 		}
 	}