switched some (x,y) and (w,h) pairs to vectors

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

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 5c1a27a4ee76a781c4fc79ad1143495ac96bfe36..87436b0faad8d862a58f82f185013d309a8f4fc9 100644 (file)
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -14,14 +14,11 @@
 #include "../../app/Input.h"
 #include "../../common/Ikari.h"
 #include "../../common/Item.h"
-#include "../../geometry/Point.h"
-#include "../../geometry/operators.h"
 #include "../../graphics/Frame.h"
 
 using app::Application;
 using app::Input;
 using common::Ikari;
-using geometry::Point;
 using geometry::Vector;
 using graphics::Frame;
 
@@ -62,7 +59,7 @@ void SelectIkari::HandleEvents(const Input &input) {
                        if (ikari->GetTargetingMode().TargetsAlly()) {
                                ac.Selection().SelectHeroes();
                        } else {
-                               ac.Selection().SelectEnemies();
+                               ac.Selection().SelectMonsters();
                        }
                        if (ikari->GetTargetingMode().TargetsAll()) {
                                ac.SetType(AttackChoice::MAGIC);
@@ -111,7 +108,7 @@ void SelectIkari::Render(SDL_Surface *screen) {
 
 void SelectIkari::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
        const Frame *frame(battle->Res().selectFrame);
-       Point<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);
@@ -119,7 +116,7 @@ void SelectIkari::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 
 void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
        const Resources &res(battle->Res());
-       Point<int> position(
+       Vector<int> position(
                        2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
                        2 * res.selectFrame->BorderHeight());
        res.normalFont->DrawString(res.itemMenuHeadline, screen, position + offset);
@@ -127,7 +124,7 @@ void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 
 void SelectIkari::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
        const Resources &res(battle->Res());
-       Point<int> position(
+       Vector<int> position(
                        2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
                        2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
        battle->ActiveHero().IkariMenu().Draw(screen, position + offset);