postponed attack type decision to their respective states

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 713c3d53ce2b276a93db8b4072eb778192e03e09..db5bb45981c723727758a85968c9f8cfe947c01d 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -49,12 +49,27 @@ 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->SetAttackType(AttackChoice::MAGIC);
+                       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) {
@@ -73,8 +88,7 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
        const Frame *frame(battle->Res().selectFrame);
        Point<int> position(frame->BorderWidth(), frame->BorderHeight());
        int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
-       // TODO: replace with font height
-       int height(frame->BorderHeight() * 13);
+       int height(battle->Res().normalFont->CharHeight() * 13);
        frame->Draw(screen, position + offset, width, height);
 }