summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-06-09 13:37:16 -0600
committerJared Adams <jaxad0127@gmail.com>2010-06-09 15:14:18 -0600
commit35e024b85a5448cba235fa400f9412fd4e289ec0 (patch)
tree58736ebdff483bf7db1398855e514a735ddf075e /src/being.h
parentec980b3c586fc64d02ad02f31497013908056d52 (diff)
downloadmana-35e024b85a5448cba235fa400f9412fd4e289ec0.tar.gz
mana-35e024b85a5448cba235fa400f9412fd4e289ec0.tar.bz2
mana-35e024b85a5448cba235fa400f9412fd4e289ec0.tar.xz
mana-35e024b85a5448cba235fa400f9412fd4e289ec0.zip
Fix dead Beings not being removed using tmwAthena
Rename mWalkTime to mActionTime in Being and have Being manage death. Reviewed-by: 4144
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/being.h b/src/being.h
index 4e7016c1..75bb6c22 100644
--- a/src/being.h
+++ b/src/being.h
@@ -121,19 +121,15 @@ class Being : public ActorSprite, public ConfigListener
void clearPath();
/**
- * Returns the walk time.
- * Used to know which frame to display and trigger
- * the next Tile step.
- * TODO: Used by eAthena only?
+ * Returns the time spent in the current action.
*/
- int getWalkTime() const { return mWalkTime; }
+ int getActionTime() const { return mActionTime; }
/**
- * Set the current WalkTime value.
- * TODO: Used by eAthena only?
+ * Set the current action time.
* @see Ea::BeingHandler that set it to tick time.
*/
- void setWalkTime(int walkTime) { mWalkTime = walkTime; }
+ void setActionTime(int actionTime) { mActionTime = actionTime; }
/**
* Makes this being take the next tile of its path.
@@ -510,10 +506,7 @@ class Being : public ActorSprite, public ConfigListener
BeingInfo *mInfo;
- /** Used to trigger the nextStep (walking on next Tile)
- * TODO: Used by eAthena only?
- */
- int mWalkTime;
+ int mActionTime; /**< Time spent in current action */
int mEmotion; /**< Currently showing emotion */
int mEmotionTime; /**< Time until emotion disappears */