diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-01-14 21:47:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-01-14 21:47:02 +0300 |
commit | 24a5939846bf593e17e09f3564d941a7c2a5bf27 (patch) | |
tree | e37187b6411480aeb385accc9345c14ab2652ebe /src/being | |
parent | 4424f769af82000bc84b9d4c9f46c20834a817e6 (diff) | |
download | mv-24a5939846bf593e17e09f3564d941a7c2a5bf27.tar.gz mv-24a5939846bf593e17e09f3564d941a7c2a5bf27.tar.bz2 mv-24a5939846bf593e17e09f3564d941a7c2a5bf27.tar.xz mv-24a5939846bf593e17e09f3564d941a7c2a5bf27.zip |
fix code style.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.cpp | 7 | ||||
-rw-r--r-- | src/being/being.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 6e5fa5e92..641f8abd6 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -917,7 +917,7 @@ const Guild *Being::getGuild(const std::string &guildName) const { FOR_EACH (GuildsMapCIter, itr, mGuilds) { - Guild *const guild = itr->second; + const Guild *const guild = itr->second; if (guild && guild->getName() == guildName) return guild; } @@ -3298,12 +3298,11 @@ void Being::updatePets() } } -void Being::unassignPet(Being *const pet1) +void Being::unassignPet(const Being *const pet1) { FOR_EACH (std::vector<Being*>::iterator, it, mPets) { - Being *const pet = *it; - if (pet == pet1) + if (*it == pet1) { mPets.erase(it); return; diff --git a/src/being/being.h b/src/being/being.h index 56319c352..7314fe1f1 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -892,7 +892,7 @@ class Being : public ActorSprite, public ConfigListener void setOwner(Being *const owner) { mOwner = owner; } - void unassignPet(Being *const pet); + void unassignPet(const Being *const pet); void removeAllPets(); @@ -1088,7 +1088,6 @@ class Being : public ActorSprite, public ConfigListener int mCriticalHit; unsigned int mPvpRank; unsigned int mNumber; - int mPetId; int mLook; int mUsageCounter; unsigned char mHairColor; |