summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-07 10:54:03 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-07 10:54:03 +0100
commit9d4162ccf4785e168ff9b8abf2c51bd13d633575 (patch)
tree8ea697903726b5c6bcd224f67e33c26746dd02eb
parent242e3bb8d92def67d5c30f2f2fd974cfb117ec04 (diff)
downloadmana-client-9d4162ccf4785e168ff9b8abf2c51bd13d633575.tar.gz
mana-client-9d4162ccf4785e168ff9b8abf2c51bd13d633575.tar.bz2
mana-client-9d4162ccf4785e168ff9b8abf2c51bd13d633575.tar.xz
mana-client-9d4162ccf4785e168ff9b8abf2c51bd13d633575.zip
Renamed TakedDamage to DamageTaken
Sounds a bit better.
-rw-r--r--src/being.cpp6
-rw-r--r--src/being.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/being.cpp b/src/being.cpp
index beed9c35..b56cb890 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -90,7 +90,7 @@ Being::Being(int id, int job, Map *map):
mChildParticleEffects(&mStatusParticleEffects, false),
mMustResetParticles(false),
mX(0), mY(0),
- mTakedDamage(0),
+ mDamageTaken(0),
mUsedTargetCursor(NULL)
{
setMap(map);
@@ -306,7 +306,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
{
if (getType() == MONSTER)
{
- mTakedDamage += amount;
+ mDamageTaken += amount;
updateName();
}
@@ -959,7 +959,7 @@ void Being::showName()
{
if (config.getValue("showMonstersTakedDamage", false))
{
- mDisplayName += ", " + toString(getTakedDamage());
+ mDisplayName += ", " + toString(getDamageTaken());
}
}
diff --git a/src/being.h b/src/being.h
index 4d0f714a..7dd54ea5 100644
--- a/src/being.h
+++ b/src/being.h
@@ -522,8 +522,8 @@ class Being : public Sprite, public ConfigListener
void flashName(int time);
- int getTakedDamage() const
- { return mTakedDamage; }
+ int getDamageTaken() const
+ { return mDamageTaken; }
void updateName();
@@ -655,7 +655,7 @@ class Being : public Sprite, public ConfigListener
Vector mDest;
int mX, mY; /**< Position on tile */
- int mTakedDamage;
+ int mDamageTaken;
/** Target cursor being used */
SimpleAnimation* mUsedTargetCursor;