X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=db5bb45981c723727758a85968c9f8cfe947c01d;hb=d872d756e64b8f1f57cba64ae19f479f8eab3927;hp=be5c610a6a553c0b1f27c003a59d99a4d5c29f2c;hpb=2ef82e057748751f795c60dcf826a001516b5ca0;p=l2e.git diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp index be5c610..db5bb45 100644 --- 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 &offset) { const Frame *frame(battle->Res().selectFrame); Point 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); }