diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-20 18:11:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-20 18:11:57 +0300 |
| commit | 9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c (patch) | |
| tree | 172ff032c6d811f6f903b31413840691bd43254e /src/being | |
| parent | 13abfc42956e176c9779ee41fddc95a4b85cb389 (diff) | |
| download | mv-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.gz mv-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.bz2 mv-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.tar.xz mv-9cf563fa7f4059bfddd82efdaa89df2ed07a6d7c.zip | |
Remove setMap from being constructor.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 4 | ||||
| -rw-r--r-- | src/being/being.h | 4 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index fdd706bbe..4745f516e 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -99,8 +99,7 @@ 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, - Map *const map) : +Being::Being(const int id, const Type type, const uint16_t subtype) : ActorSprite(id), mNextSound(), mInfo(BeingInfo::unknown), @@ -190,7 +189,6 @@ Being::Being(const int id, const Type type, const uint16_t subtype, mSpriteHide[f] = 0; } - setMap(map); setSubtype(subtype, 0); if (mType == PLAYER) diff --git a/src/being/being.h b/src/being/being.h index 6e9d55768..79f5ebafb 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -155,10 +155,8 @@ class Being : public ActorSprite, public ConfigListener * * @param id a unique being id * @param subtype partly determines the type of the being - * @param map the map the being is on */ - Being(const int id, const Type type, const uint16_t subtype, - Map *const map); + Being(const int id, const Type type, const uint16_t subtype); A_DELETE_COPY(Being) diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 6df48dec7..17424e6a8 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -88,7 +88,7 @@ extern MiniStatusWindow *miniStatusWindow; extern SkillDialog *skillDialog; LocalPlayer::LocalPlayer(const int id, const int subtype) : - Being(id, PLAYER, subtype, nullptr), + Being(id, PLAYER, subtype), mGMLevel(0), mInvertDirection(0), mCrazyMoveType(config.getIntValue("crazyMoveType")), |