diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-20 02:01:14 +0100 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2012-01-27 19:20:26 +0100 |
commit | 0432de0928fbd41d6519a39e2e7212df66910013 (patch) | |
tree | 626dacc78bf735e2c446e9153afa31a0559f5a77 /src/localplayer.h | |
parent | 5e8cc46a21e03acc7589fca181f7fae677853b29 (diff) | |
download | mana-0432de0928fbd41d6519a39e2e7212df66910013.tar.gz mana-0432de0928fbd41d6519a39e2e7212df66910013.tar.bz2 mana-0432de0928fbd41d6519a39e2e7212df66910013.tar.xz mana-0432de0928fbd41d6519a39e2e7212df66910013.zip |
Random hacking cleanups in the LocalPlayer class
- Renamed mLastTarget to mLastTargetTime, and mLastAction to mLastActionTime
to clarify their use.
- NULL -> 0.
- Removed the unused mLocalWalkTime member.
+ Change requested by bjorn.
Reviewed-by: Thorjørn Lindeijer
Diffstat (limited to 'src/localplayer.h')
-rw-r--r-- | src/localplayer.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index ea429b18..9e2139c2 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -59,12 +59,6 @@ enum }; /** - * Attack range not set value - */ -enum { ATTACK_RANGE_NOT_SET = -1 }; - - -/** * The local player character. */ class LocalPlayer : public Being @@ -231,8 +225,9 @@ class LocalPlayer : public Being int mAttackRange; - int mTargetTime; /** How long the being has been targeted **/ - int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ + int mTargetTime; /**< How long the being has been targeted **/ + /** Time stamp of last targeting action, -1 if none. */ + int mLastTargetTime; int mGMLevel; @@ -241,14 +236,11 @@ class LocalPlayer : public Being FloorItem *mPickUpTarget; bool mGoingToTarget; - bool mKeepAttacking; /** Whether or not to continue to attack */ - int mLastAction; /**< Time stamp of the last action, -1 if none. */ + bool mKeepAttacking; /**< Whether or not to continue to attack */ + int mLastActionTime; /**< Time stamp of the last action, -1 if none. */ int mWalkingDir; /**< The direction the player is walking in. */ bool mPathSetByMouse; /**< Tells if the path was set using mouse */ - int mLocalWalkTime; /**< Timestamp used to control keyboard walk - messages flooding */ - typedef std::pair<std::string, int> MessagePair; /** Queued messages*/ std::list<MessagePair> mMessages; |