diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-24 22:03:11 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-25 10:45:54 +0300 |
commit | 67f8b40f80368dad17a9da50c78923433e266f54 (patch) | |
tree | 4667906e1ab807c31216f89da450b3cce5585150 /src/being/localplayer.cpp | |
parent | 286f34b97b8a4fb56fde1f9e5f3a95ba0c807441 (diff) | |
download | mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.gz mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.bz2 mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.xz mv-67f8b40f80368dad17a9da50c78923433e266f54.zip |
Fix code style.
Diffstat (limited to 'src/being/localplayer.cpp')
-rw-r--r-- | src/being/localplayer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index c3f267cb6..321e849e5 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -38,7 +38,6 @@ #include "being/attributes.h" #include "being/beingflag.h" -#include "being/pickup.h" #include "being/playerinfo.h" #include "being/playerrelations.h" @@ -803,9 +802,9 @@ void LocalPlayer::untarget() void LocalPlayer::pickedUp(const ItemInfo &itemInfo, const int amount, const unsigned char color, const int floorItemId, - const unsigned char fail) + const Pickup::Type fail) { - if (fail) + if (fail != Pickup::OKAY) { if (actorManager && floorItemId) { @@ -1157,7 +1156,10 @@ void LocalPlayer::moveToTarget(int dist) debugPath = mMap->findPath(static_cast<int>( playerPos.x - mapTileSize / 2) / mapTileSize, static_cast<int>(playerPos.y - mapTileSize) / mapTileSize, - mTarget->getTileX(), mTarget->getTileY(), getBlockWalkMask(), 0); + mTarget->getTileX(), + mTarget->getTileY(), + getBlockWalkMask(), + 0); } const size_t sz = debugPath.size(); |