X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FAttackTypeMenu.cpp;h=952bf8122e8d06900257f34791d50c49a4c02894;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=b881d8b6f5ee57d5a95e515109bf5e132d9c3148;hpb=010a336797f1419945bed60560cc61fb492793f4;p=l2e.git

diff --git a/src/battle/AttackTypeMenu.cpp b/src/battle/AttackTypeMenu.cpp
index b881d8b..952bf81 100644
--- a/src/battle/AttackTypeMenu.cpp
+++ b/src/battle/AttackTypeMenu.cpp
@@ -1,49 +1,24 @@
-/*
- * AttackTypeMenu.cpp
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #include "AttackTypeMenu.h"
 
-#include "../app/Input.h"
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Sprite.h"
 
-using app::Input;
-using geometry::Point;
-using geometry::Vector;
+using math::Vector;
 
 namespace battle {
 
-void AttackTypeMenu::ReadInput(const Input &input) {
-	if (input.IsDown(Input::PAD_UP)) {
-		selected = MAGIC;
-	} else if (input.IsDown(Input::PAD_RIGHT)) {
-		selected = DEFEND;
-	} else if (input.IsDown(Input::PAD_DOWN)) {
-		selected = IKARI;
-	} else if (input.IsDown(Input::PAD_LEFT)) {
-		selected = ITEM;
-	} else {
-		selected = SWORD;
-	}
-}
-
-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());
-
-	icons->Draw(screen, position + swordOffset, SWORD, (selected == SWORD) ? 1 : 0);
-	icons->Draw(screen, position + magicOffset, MAGIC, (selected == MAGIC) ? 1 : 0);
-	icons->Draw(screen, position + defendOffset, DEFEND, (selected == DEFEND) ? 1 : 0);
-	icons->Draw(screen, position + ikariOffset, IKARI, (selected == IKARI) ? 1 : 0);
-	icons->Draw(screen, position + itemOffset, ITEM, (selected == ITEM) ? 1 : 0);
+void AttackTypeMenu::Render(SDL_Surface *screen, const math::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);
+	icons->Draw(screen, position + defendOffset, AttackChoice::DEFEND, (selected == AttackChoice::DEFEND) ? 1 : 0);
+	icons->Draw(screen, position + ikariOffset, AttackChoice::IKARI, (selected == AttackChoice::IKARI) ? 1 : 0);
+	icons->Draw(screen, position + itemOffset, AttackChoice::ITEM, (selected == AttackChoice::ITEM) ? 1 : 0);
 }
 
 }