Merge branch 'master' into menus

[l2e.git] / src / battle / AttackTypeMenu.h

diff --git a/src/battle/AttackTypeMenu.h b/src/battle/AttackTypeMenu.h
index 4b38dd3bd45d2ecf908fb0242df93d94e5a13123..db07443fd7e008ba26c7045e6108beb162a61cba 100644 (file)
--- a/src/battle/AttackTypeMenu.h
+++ b/src/battle/AttackTypeMenu.h
@@ -9,7 +9,7 @@
 #define BATTLE_ATTACKTYPEMENU_H_
 
 #include "AttackChoice.h"
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 #include "../graphics/Sprite.h"
 
 #include <SDL.h>
@@ -25,12 +25,14 @@ public:
 public:
        void Select(AttackChoice::Type t) { selected = t; }
        AttackChoice::Type Selected() const { return selected; }
-       void Render(SDL_Surface *screen, const geometry::Point<int> &position);
+       void Render(SDL_Surface *screen, const geometry::Vector<int> &position);
 
        int Width() const { return 3 * IconWidth(); }
        int Height() const { return 3 * IconHeight(); }
+       geometry::Vector<int> Size() const { return 3 * IconSize(); }
        int IconWidth() const { return icons->Width(); }
        int IconHeight() const { return icons->Height(); }
+       const geometry::Vector<int> &IconSize() const { return icons->Size(); }
 
 private:
        const graphics::Sprite *icons;