added attack targets selection state

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index be5c610a6a553c0b1f27c003a59d99a4d5c29f2c..db5bb45981c723727758a85968c9f8cfe947c01d 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -50,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();
                }
@@ -87,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);
 }