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 5f358fbe45c031f2420749654f97885941e29c8b..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) {
@@ -65,6 +79,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
        parent->Render(screen);
        Vector<int> offset(battle->CalculateScreenOffset(screen));
        RenderFrame(screen, offset);
+       RenderHeadline(screen, offset);
        RenderMenu(screen, offset);
 }
 
@@ -77,8 +92,19 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
        frame->Draw(screen, position + offset, width, height);
 }
 
+void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
+       const Resources &res(battle->Res());
+       Point<int> position(
+                       2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+                       2 * res.selectFrame->BorderHeight());
+       res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
+}
+
 void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-       Point<int> position(2 * battle->Res().selectFrame->BorderWidth(), 2 * battle->Res().selectFrame->BorderHeight());
+       const Resources &res(battle->Res());
+       Point<int> position(
+                       2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
+                       2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
        battle->GetSpellMenu().Draw(screen, position + offset);
 }