summaryrefslogtreecommitdiff
path: root/src/being/being.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-05 19:36:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-05 19:36:59 +0300
commit6c5e393bfa05f3cc42609b91d549e45c55220a6e (patch)
tree045ddb783b464b0dbf8b762bcc927fadd01330d1 /src/being/being.cpp
parent1a9f3cc7de6e7e304290d2979eefbf9b0239a968 (diff)
downloadManaVerse-6c5e393bfa05f3cc42609b91d549e45c55220a6e.tar.gz
ManaVerse-6c5e393bfa05f3cc42609b91d549e45c55220a6e.tar.bz2
ManaVerse-6c5e393bfa05f3cc42609b91d549e45c55220a6e.tar.xz
ManaVerse-6c5e393bfa05f3cc42609b91d549e45c55220a6e.zip
Replace in Being getter getName to mName.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r--src/being/being.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 127c38232..227570b40 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -743,7 +743,9 @@ void Being::takeDamage(Being *restrict const attacker,
else if (attacker == localPlayer && amount)
{
chatWindow->battleChatLog(strprintf("%s : You hit %s -%d",
- attacker->getName().c_str(), getName().c_str(), amount),
+ attacker->mName.c_str(),
+ mName.c_str(),
+ amount),
ChatMsgType::BY_PLAYER);
}
}
@@ -766,7 +768,7 @@ void Being::takeDamage(Being *restrict const attacker,
if (amount > 0)
{
if (localPlayer && localPlayer == this)
- localPlayer->setLastHitFrom(attacker->getName());
+ localPlayer->setLastHitFrom(attacker->mName);
mDamageTaken += amount;
if (mInfo)
@@ -797,9 +799,9 @@ void Being::takeDamage(Being *restrict const attacker,
}
else if (mType == ActorType::Player &&
socialWindow &&
- !getName().empty())
+ !mName.empty())
{
- socialWindow->updateAvatar(getName());
+ socialWindow->updateAvatar(mName);
}
if (effectManager)
@@ -1150,7 +1152,7 @@ void Being::removeGuild(const int id) restrict2
socialWindow->removeTab(mGuilds[id]);
if (mGuilds[id])
- mGuilds[id]->removeMember(getName());
+ mGuilds[id]->removeMember(mName);
mGuilds.erase(id);
}
@@ -1241,7 +1243,7 @@ void Being::updateGuild() restrict2
updateColors();
return;
}
- if (guild->getMember(getName()))
+ if (guild->getMember(mName))
{
setGuild(guild);
if (!guild->getName().empty())
@@ -2719,7 +2721,7 @@ void Being::addToCache() const restrict2
if (!mLowTraffic)
return;
- entry->setName(getName());
+ entry->setName(mName);
entry->setLevel(getLevel());
entry->setPartyName(getPartyName());
entry->setGuildName(getGuildName());