summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-21 22:44:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-21 23:18:20 +0300
commit62ffd2023d9073e452fe2e2f50cf6b2f11224d6f (patch)
tree8c45c7c16b0c20ac6a7b722d69c148149e6b651f /src/gui/viewport.cpp
parentcfa5391c1be51ef49380e398a72c813255d6316e (diff)
downloadmv-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.gz
mv-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.bz2
mv-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.tar.xz
mv-62ffd2023d9073e452fe2e2f50cf6b2f11224d6f.zip
next code style changes.
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp16
1 files changed, 10 insertions, 6 deletions
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();