added target selection type detection for weapons

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

diff --git a/src/battle/AttackTypeMenu.cpp b/src/battle/AttackTypeMenu.cpp
index b881d8b6f5ee57d5a95e515109bf5e132d9c3148..2ec7a1f129b26bbe25eadf47232d014023fc8cdd 100644 (file)
--- a/src/battle/AttackTypeMenu.cpp
+++ b/src/battle/AttackTypeMenu.cpp
@@ -7,31 +7,15 @@
 
 #include "AttackTypeMenu.h"
 
-#include "../app/Input.h"
 #include "../geometry/operators.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Sprite.h"
 
-using app::Input;
 using geometry::Point;
 using geometry::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);
@@ -39,11 +23,11 @@ void AttackTypeMenu::Render(SDL_Surface *screen, const geometry::Point<int> &pos
        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);
+       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);
 }
 
 }