From 694e07d193e7c5758a7d672b45668651b034003d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 31 May 2015 00:19:18 +0300
Subject: Convert InputAction enum into strong typed enum.

---
 src/gui/viewport.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 78b66b930..5c0c7328c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -455,20 +455,18 @@ bool Viewport::leftMouseAction()
                      type == ActorType::Npc))
             {
                 if ((localPlayer->withinAttackRange(mHoverBeing) ||
-                    inputManager.isActionActive(static_cast<int>(
-                    InputAction::ATTACK))))
+                    inputManager.isActionActive(InputAction::ATTACK)))
                 {
                     validateSpeed();
                     if (!mStatsReUpdated && localPlayer != mHoverBeing)
                     {
                         localPlayer->attack(mHoverBeing,
                             !inputManager.isActionActive(
-                            static_cast<int>(InputAction::STOP_ATTACK)));
+                            InputAction::STOP_ATTACK));
                         return true;
                     }
                 }
-                else if (!inputManager.isActionActive(static_cast<int>(
-                         InputAction::ATTACK)))
+                else if (!inputManager.isActionActive(InputAction::ATTACK))
                 {
                     validateSpeed();
                     if (!mStatsReUpdated && localPlayer != mHoverBeing)
@@ -498,8 +496,7 @@ bool Viewport::leftMouseAction()
         return true;
     }
     // Just walk around
-    else if (!inputManager.isActionActive(static_cast<int>(
-             InputAction::ATTACK)))
+    else if (!inputManager.isActionActive(InputAction::ATTACK))
     {
         validateSpeed();
         localPlayer->stopAttack();
@@ -964,9 +961,8 @@ void Viewport::returnCamera()
 
 void Viewport::validateSpeed()
 {
-    if (!inputManager.isActionActive(static_cast<int>(
-        InputAction::TARGET_ATTACK)) && !inputManager.isActionActive(
-        static_cast<int>(InputAction::ATTACK)))
+    if (!inputManager.isActionActive(InputAction::TARGET_ATTACK) &&
+        !inputManager.isActionActive(InputAction::ATTACK))
     {
         if (Game::instance())
             Game::instance()->setValidSpeed();
-- 
cgit v1.2.3-60-g2f50