X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FAttackTypeMenu.cpp;h=f9786fb2c2405d1da0311e4038d9d93975cf6ca4;hb=520af5a8ef4fdfd4156377d4fccd93eecd450f0f;hp=2ec7a1f129b26bbe25eadf47232d014023fc8cdd;hpb=4d0a650b178d81387caa36953ed06cc5d6c28213;p=l2e.git

diff --git a/src/battle/AttackTypeMenu.cpp b/src/battle/AttackTypeMenu.cpp
index 2ec7a1f..f9786fb 100644
--- a/src/battle/AttackTypeMenu.cpp
+++ b/src/battle/AttackTypeMenu.cpp
@@ -7,21 +7,19 @@
 
 #include "AttackTypeMenu.h"
 
-#include "../geometry/operators.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Sprite.h"
 
-using geometry::Point;
 using geometry::Vector;
 
 namespace battle {
 
-void AttackTypeMenu::Render(SDL_Surface *screen, const geometry::Point<int> &position) {
-	Vector<int> swordOffset(IconWidth(), IconHeight());
-	Vector<int> magicOffset(IconWidth(), 0);
-	Vector<int> defendOffset(2 * IconWidth(), IconHeight());
-	Vector<int> ikariOffset(IconWidth(), 2 * IconHeight());
-	Vector<int> itemOffset(0, IconHeight());
+void AttackTypeMenu::Render(SDL_Surface *screen, const geometry::Vector<int> &position) {
+	const Vector<int> &swordOffset(IconSize());
+	const Vector<int> magicOffset(IconWidth(), 0);
+	const Vector<int> defendOffset(2 * IconWidth(), IconHeight());
+	const Vector<int> ikariOffset(IconWidth(), 2 * IconHeight());
+	const Vector<int> itemOffset(0, IconHeight());
 
 	icons->Draw(screen, position + swordOffset, AttackChoice::SWORD, (selected == AttackChoice::SWORD) ? 1 : 0);
 	icons->Draw(screen, position + magicOffset, AttackChoice::MAGIC, (selected == AttackChoice::MAGIC) ? 1 : 0);