summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-05-06 18:03:52 +0300
committerAndrei Karas <akaras@inbox.ru>2012-05-06 20:52:08 +0300
commitf0ae9007f666580259ca8c120f7aaee58a63f85a (patch)
treefebc9da1d2ee1a5d3f85096727cd8c26d036ea5e /src/being.cpp
parentf7c9165e0f59a33404a486c0b154a2c21ed9a9fa (diff)
downloadmv-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.gz
mv-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.bz2
mv-f0ae9007f666580259ca8c120f7aaee58a63f85a.tar.xz
mv-f0ae9007f666580259ca8c120f7aaee58a63f85a.zip
Fix code style.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 3459132b7..e8338df6c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1191,7 +1191,7 @@ void Being::nextTile()
Uint8 dir = calcDirection(pos.x, pos.y);
if (dir)
- setDirection(static_cast<Uint8>(dir));
+ setDirection(dir);
if (!mMap || !mMap->getWalk(pos.x, pos.y, getWalkMask()))
{
@@ -1325,7 +1325,7 @@ void Being::logic()
{
if (getWalkSpeed().x && static_cast<int> ((static_cast<float>(
get_elapsed_time(mActionTime)) * static_cast<float>(
- frameCount)) / static_cast<float>(getWalkSpeed().x))
+ frameCount)) / getWalkSpeed().x)
>= frameCount)
{
nextTile();
@@ -1412,8 +1412,7 @@ void Being::logic()
if (!isAlive() && getWalkSpeed().x
&& Net::getGameHandler()->removeDeadBeings()
&& static_cast<int> ((static_cast<float>(get_elapsed_time(mActionTime))
- / static_cast<float>(getWalkSpeed().x)))
- >= static_cast<int>(frameCount))
+ / static_cast<float>(getWalkSpeed().x))) >= frameCount)
{
if (mType != PLAYER && actorSpriteManager)
actorSpriteManager->destroy(this);