X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FAttackTypeMenu.h;h=4b38dd3bd45d2ecf908fb0242df93d94e5a13123;hb=19f0f64186c38fab38fe802bc1b797b1418d573a;hp=26a9dd9d07089ea128fe566c884c01fd0d30d045;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git

diff --git a/src/battle/AttackTypeMenu.h b/src/battle/AttackTypeMenu.h
index 26a9dd9..4b38dd3 100644
--- a/src/battle/AttackTypeMenu.h
+++ b/src/battle/AttackTypeMenu.h
@@ -8,6 +8,7 @@
 #ifndef BATTLE_ATTACKTYPEMENU_H_
 #define BATTLE_ATTACKTYPEMENU_H_
 
+#include "AttackChoice.h"
 #include "../geometry/Point.h"
 #include "../graphics/Sprite.h"
 
@@ -17,22 +18,13 @@ namespace battle {
 
 class AttackTypeMenu {
 
-public:
-	enum Icon {
-		SWORD,
-		MAGIC,
-		DEFEND,
-		IKARI,
-		ITEM
-	};
-
 public:
 	explicit AttackTypeMenu(const graphics::Sprite *icons)
-	: icons(icons), selected(SWORD) { }
+	: icons(icons), selected(AttackChoice::SWORD) { }
 
 public:
-	void Select(Icon i) { selected = i; }
-	Icon Selected() const { return selected; }
+	void Select(AttackChoice::Type t) { selected = t; }
+	AttackChoice::Type Selected() const { return selected; }
 	void Render(SDL_Surface *screen, const geometry::Point<int> &position);
 
 	int Width() const { return 3 * IconWidth(); }
@@ -42,7 +34,7 @@ public:
 
 private:
 	const graphics::Sprite *icons;
-	Icon selected;
+	AttackChoice::Type selected;
 
 };