summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-28 14:30:31 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-28 14:30:31 +0300
commit462867b1d99cf63a27566449cbf8f0feda7f1ec6 (patch)
tree3d4a159827bc5af72a2c5aedc89698fee44033c2 /src/being/being.cpp
parentbc27e1bc29ab07a8560db30355ca3aeb3cfb724f (diff)
downloadmv-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.gz
mv-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.bz2
mv-462867b1d99cf63a27566449cbf8f0feda7f1ec6.tar.xz
mv-462867b1d99cf63a27566449cbf8f0feda7f1ec6.zip
Revert "Remove setMap from being constructor."
This reverts commit 9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 4745f516e..fdd706bbe 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -99,7 +99,8 @@ std::list<BeingCacheEntry*> beingInfoCache;
typedef std::map<int, Guild*>::const_iterator GuildsMapCIter;
typedef std::map<int, int>::const_iterator IntMapCIter;
-Being::Being(const int id, const Type type, const uint16_t subtype) :
+Being::Being(const int id, const Type type, const uint16_t subtype,
+ Map *const map) :
ActorSprite(id),
mNextSound(),
mInfo(BeingInfo::unknown),
@@ -189,6 +190,7 @@ Being::Being(const int id, const Type type, const uint16_t subtype) :
mSpriteHide[f] = 0;
}
+ setMap(map);
setSubtype(subtype, 0);
if (mType == PLAYER)