From 9d4162ccf4785e168ff9b8abf2c51bd13d633575 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sun, 7 Feb 2010 10:54:03 +0100 Subject: Renamed TakedDamage to DamageTaken Sounds a bit better. --- src/being.cpp | 6 +++--- src/being.h | 6 +++--- 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; -- cgit v1.2.3-60-g2f50