added extended spectator mode. Closes #28

1 files changed, 23 insertions, 18 deletions

diff --git a/src/game/server/player.h b/src/game/server/player.h
index f4d82d24..c638fae8 100644
--- a/src/game/server/player.h
+++ b/src/game/server/player.h
@@ -25,6 +25,7 @@ public:
 	int GetCID() const { return m_ClientID; };
 	
 	void Tick();
+	void PostTick();
 	void Snap(int SnappingClient);
 
 	void OnDirectInput(CNetObj_PlayerInput *NewInput);
@@ -43,18 +44,22 @@ public:
 
 	// used for snapping to just update latency if the scoreboard is active
 	int m_aActLatency[MAX_CLIENTS];
+
+	// used for spectator mode
+	int m_SpectatorID;
 	
 	//
 	int m_Vote;
 	int m_VotePos;
 	//
-	int m_Last_VoteCall;
-	int m_Last_VoteTry;
-	int m_Last_Chat;
-	int m_Last_SetTeam;
-	int m_Last_ChangeInfo;
-	int m_Last_Emote;
-	int m_Last_Kill;
+	int m_LastVoteCall;
+	int m_LastVoteTry;
+	int m_LastChat;
+	int m_LastSetTeam;
+	int m_LastSetSpectatorMode;
+	int m_LastChangeInfo;
+	int m_LastEmote;
+	int m_LastKill;
 	
 	// TODO: clean this up
 	struct 
@@ -76,6 +81,17 @@ public:
 		int m_TargetX;
 		int m_TargetY;
 	} m_LatestActivity;
+
+	// network latency calculations	
+	struct
+	{
+		int m_Accum;
+		int m_AccumMin;
+		int m_AccumMax;
+		int m_Avg;
+		int m_Min;
+		int m_Max;	
+	} m_Latency;
 	
 private:
 	CCharacter *Character;
@@ -88,17 +104,6 @@ private:
 	bool m_Spawning;
 	int m_ClientID;
 	int m_Team;
-
-	// network latency calculations	
-	struct
-	{
-		int m_Accum;
-		int m_AccumMin;
-		int m_AccumMax;
-		int m_Avg;
-		int m_Min;
-		int m_Max;	
-	} m_Latency;
 };
 
 #endif