preliminary solution for loading inventory in item select

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

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index 5e687b670622ec25f4b870cacfe00fa15a34e3cb..786277d764900f036dbfffca578d3eacfd0db114 100644 (file)
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -65,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:
@@ -77,6 +77,7 @@ void SelectAttackType::HandleInput(const Input &input) {
                                }
                                break;
                        case AttackChoice::DEFEND:
+                               battle->SetAttackType(AttackChoice::DEFEND);
                                battle->NextHero();
                                break;
                        case AttackChoice::IKARI: