postponed attack type decision to their respective states

[l2e.git] / src / battle / states / SelectAttackType.cpp

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c5e0bba3b580ebcd20886fed04996f54f590b130..786277d764900f036dbfffca578d3eacfd0db114 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -7,6 +7,7 @@
 
 #include "SelectAttackType.h"
 
+#include "SelectIkari.h"
 #include "SelectItem.h"
 #include "SelectMoveAction.h"
 #include "SelectSpell.h"
@@ -64,10 +65,10 @@ void SelectAttackType::HandleInput(const Input &input) {
        }
 
        if (input.JustPressed(Input::ACTION_A)) {
-               battle->SetAttackType(battle->GetAttackTypeMenu().Selected());
                switch (battle->GetAttackTypeMenu().Selected()) {
                        case AttackChoice::SWORD:
                                // TODO: switch to target select
+                               battle->SetAttackType(AttackChoice::SWORD);
                                battle->NextHero();
                                break;
                        case AttackChoice::MAGIC:
@@ -76,11 +77,11 @@ void SelectAttackType::HandleInput(const Input &input) {
                                }
                                break;
                        case AttackChoice::DEFEND:
+                               battle->SetAttackType(AttackChoice::DEFEND);
                                battle->NextHero();
                                break;
                        case AttackChoice::IKARI:
-                               // TODO: switch to ikari attack select
-                               battle->NextHero();
+                               ctrl->PushState(new SelectIkari(battle, this));
                                break;
                        case AttackChoice::ITEM:
                                ctrl->PushState(new SelectItem(battle, this));