From 0432de0928fbd41d6519a39e2e7212df66910013 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 20 Jan 2012 02:01:14 +0100 Subject: Random hacking cleanups in the LocalPlayer class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 --- src/localplayer.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/localplayer.h') diff --git a/src/localplayer.h b/src/localplayer.h index ea429b18..9e2139c2 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -58,12 +58,6 @@ enum PICKUP_DROP_STEAL }; -/** - * Attack range not set value - */ -enum { ATTACK_RANGE_NOT_SET = -1 }; - - /** * The local player character. */ @@ -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 MessagePair; /** Queued messages*/ std::list mMessages; -- cgit v1.2.3-70-g09d2