summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-24 22:03:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-25 10:45:54 +0300
commit67f8b40f80368dad17a9da50c78923433e266f54 (patch)
tree4667906e1ab807c31216f89da450b3cce5585150 /src/being
parent286f34b97b8a4fb56fde1f9e5f3a95ba0c807441 (diff)
downloadmv-67f8b40f80368dad17a9da50c78923433e266f54.tar.gz
mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.bz2
mv-67f8b40f80368dad17a9da50c78923433e266f54.tar.xz
mv-67f8b40f80368dad17a9da50c78923433e266f54.zip
Fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp1
-rw-r--r--src/being/localplayer.cpp10
-rw-r--r--src/being/localplayer.h4
-rw-r--r--src/being/playerinfo.cpp2
4 files changed, 10 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 97b20ddc6..bfcb45eac 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -201,6 +201,7 @@ Being::Being(const int id,
mNumber(100),
mUsageCounter(1),
mKarma(0),
+ mManner(0),
mLook(0U),
mHairColor(0),
mErased(false),
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();
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index bfec5ad58..46ed22cb8 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -25,6 +25,8 @@
#include "being/being.h"
+#include "being/pickup.h"
+
#include "gui/userpalette.h"
#include "listeners/actorspritelistener.h"
@@ -174,7 +176,7 @@ class LocalPlayer final : public Being,
*/
void pickedUp(const ItemInfo &itemInfo, const int amount,
const unsigned char color, const int floorItemId,
- const unsigned char fail);
+ const Pickup::Type fail);
int getLevel() const override final A_WARN_UNUSED;
diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp
index a6ec14c27..632fc7b09 100644
--- a/src/being/playerinfo.cpp
+++ b/src/being/playerinfo.cpp
@@ -37,8 +37,6 @@
#include "gui/windows/npcdialog.h"
#include "gui/windows/npcpostdialog.h"
-#include "resources/iteminfo.h"
-
#include "net/homunculushandler.h"
#include "net/inventoryhandler.h"
#include "net/mercenaryhandler.h"