X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=605ba2caef9ea52670ee5e898b4bea3bb29dab4a;hb=222167ba3722dc7f47ff7510006bd516e0010a50;hp=c4fb5000b60c33a532b9363b97fdfa495f6ec70e;hpb=c1443f347c55be69ad35d332ecb9f21dd85d965e;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index c4fb500..605ba2c 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -37,6 +37,8 @@ void SelectIkari::ExitState(Application &c, SDL_Surface *screen) {
 
 void SelectIkari::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHeroTargets().HasSelected()) {
+		battle->SetAttackType(AttackChoice::IKARI);
+		battle->ActiveHeroAttackChoice().SetItem(battle->GetIkariMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -51,7 +53,7 @@ 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());
@@ -73,7 +75,7 @@ void SelectIkari::HandleInput(const Input &input) {
 				} else {
 					battle->ActiveHeroTargets().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().magicTargetCursor));
+				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
 			}
 		}
 	}