added item target selection

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 954b39eabf115d95bfc6a6b36e2e4be209b5f7b2..db5bb45981c723727758a85968c9f8cfe947c01d 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -16,8 +16,6 @@
 #include "../../geometry/Point.h"
 #include "../../graphics/Frame.h"
 
-#include <iostream>
-
 using app::Application;
 using app::Input;
 using geometry::Point;
@@ -52,6 +50,7 @@ void SelectSpell::HandleInput(const Input &input) {
        if (input.JustPressed(Input::ACTION_A)) {
                // TODO: switch to target select
                if (battle->GetSpellMenu().SelectedIsEnabled()) {
+                       battle->SetAttackType(AttackChoice::MAGIC);
                        battle->NextHero();
                        ctrl->PopState();
                }
@@ -60,24 +59,16 @@ void SelectSpell::HandleInput(const Input &input) {
                ctrl->PopState(); // return control to parent
        }
        if (input.JustPressed(Input::PAD_UP)) {
-               std::cout << "pressed up" << std::endl;
                battle->GetSpellMenu().PreviousRow();
-               std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
        }
        if (input.JustPressed(Input::PAD_RIGHT)) {
-               std::cout << "pressed right" << std::endl;
                battle->GetSpellMenu().NextItem();
-               std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
        }
        if (input.JustPressed(Input::PAD_DOWN)) {
-               std::cout << "pressed down" << std::endl;
                battle->GetSpellMenu().NextRow();
-               std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
        }
        if (input.JustPressed(Input::PAD_LEFT)) {
-               std::cout << "pressed left" << std::endl;
                battle->GetSpellMenu().PreviousItem();
-               std::cout << "selected index: " << battle->GetSpellMenu().SelectedIndex() << std::endl;
        }
 }
 
@@ -97,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);
 }