moved TODOs to tracker

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

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 7647e2898f2c11cf80b2275c414b651d6048aa77..d1506fa23ee2f41fa6d03d7afa04af7e54b0c8ef 100644 (file)
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -62,8 +62,7 @@ void SelectIkari::HandleEvents(const Input &input) {
                                ac.Selection().SelectMonsters();
                        }
                        if (ikari->GetTargetingMode().TargetsAll()) {
-                               ac.SetType(AttackChoice::MAGIC);
-                               // TODO: remove item from inventory
+                               ac.SetType(AttackChoice::IKARI);
                                ac.SetItem(battle->ActiveHero().IkariMenu().Selected());
                                battle->NextHero();
                                ctrl->PopState();
@@ -108,7 +107,7 @@ void SelectIkari::Render(SDL_Surface *screen) {
 
 void SelectIkari::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
        const Frame *frame(battle->Res().selectFrame);
-       Vector<int> position(frame->BorderWidth(), frame->BorderHeight());
+       Vector<int> position(frame->BorderSize());
        int width(battle->Width() - 2 * frame->BorderWidth());
        int height(battle->Res().normalFont->CharHeight() * 13);
        frame->Draw(screen, position + offset, width, height);