fixed scrolling in Menu

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 713c3d53ce2b276a93db8b4072eb778192e03e09..be5c610a6a553c0b1f27c003a59d99a4d5c29f2c 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -49,12 +49,26 @@ void SelectSpell::Resize(int width, int height) {
 void SelectSpell::HandleInput(const Input &input) {
        if (input.JustPressed(Input::ACTION_A)) {
                // TODO: switch to target select
-               battle->NextHero();
-               ctrl->PopState();
+               if (battle->GetSpellMenu().SelectedIsEnabled()) {
+                       battle->NextHero();
+                       ctrl->PopState();
+               }
        }
        if (input.JustPressed(Input::ACTION_B)) {
                ctrl->PopState(); // return control to parent
        }
+       if (input.JustPressed(Input::PAD_UP)) {
+               battle->GetSpellMenu().PreviousRow();
+       }
+       if (input.JustPressed(Input::PAD_RIGHT)) {
+               battle->GetSpellMenu().NextItem();
+       }
+       if (input.JustPressed(Input::PAD_DOWN)) {
+               battle->GetSpellMenu().NextRow();
+       }
+       if (input.JustPressed(Input::PAD_LEFT)) {
+               battle->GetSpellMenu().PreviousItem();
+       }
 }
 
 void SelectSpell::UpdateWorld(float deltaT) {