From 62ffd2023d9073e452fe2e2f50cf6b2f11224d6f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Aug 2012 22:44:44 +0300
Subject: next code style changes.

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

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

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 194ad7310..6103c8b86 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -499,18 +499,20 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     }
                 }
                 else if (player_node->withinAttackRange(mHoverBeing) ||
-                         inputManager.isActionActive(Input::KEY_ATTACK))
+                         inputManager.isActionActive(static_cast<int>(
+                         Input::KEY_ATTACK)))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
                     {
                         player_node->attack(mHoverBeing,
                             !inputManager.isActionActive(
-                            Input::KEY_STOP_ATTACK));
+                            static_cast<int>(Input::KEY_STOP_ATTACK)));
                         return;
                     }
                 }
-                else if (!inputManager.isActionActive(Input::KEY_ATTACK))
+                else if (!inputManager.isActionActive(static_cast<int>(
+                         Input::KEY_ATTACK)))
                 {
                     validateSpeed();
                     if (player_node != mHoverBeing)
@@ -528,7 +530,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
             player_node->pickUp(mHoverItem);
         }
         // Just walk around
-        else if (!inputManager.isActionActive(Input::KEY_ATTACK))
+        else if (!inputManager.isActionActive(static_cast<int>(
+                 Input::KEY_ATTACK)))
         {
             validateSpeed();
             player_node->stopAttack();
@@ -929,8 +932,9 @@ void Viewport::returnCamera()
 
 void Viewport::validateSpeed()
 {
-    if (!inputManager.isActionActive(Input::KEY_TARGET_ATTACK)
-        && !inputManager.isActionActive(Input::KEY_ATTACK))
+    if (!inputManager.isActionActive(static_cast<int>(
+        Input::KEY_TARGET_ATTACK)) && !inputManager.isActionActive(
+        static_cast<int>(Input::KEY_ATTACK)))
     {
         if (Game::instance())
             Game::instance()->setValidSpeed();
-- 
cgit v1.2.3-60-g2f50