about summary refs log tree commit diff
path: root/src/game/server/player.h
diff options
context:
space:
mode:
authorMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-30 04:05:57 +0200
committerMarius "Teelevision" Neugebauer <marius@teele.eu>2014-03-30 04:05:57 +0200
commite799504cb2655bb3aa3a25c2a69ddc80558f9e99 (patch)
treee9d3d8f63f4b50de198b5444f1d5111bc4391554 /src/game/server/player.h
parent19a471a30c922ea3beffc7489fa05fe16d614f5b (diff)
downloadzcatch-e799504cb2655bb3aa3a25c2a69ddc80558f9e99.tar.gz
zcatch-e799504cb2655bb3aa3a25c2a69ddc80558f9e99.zip
reworked the catching, counting and color system
Diffstat (limited to 'src/game/server/player.h')
-rw-r--r--src/game/server/player.h22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/game/server/player.h b/src/game/server/player.h
index a19209a8..51deaa5e 100644
--- a/src/game/server/player.h
+++ b/src/game/server/player.h
@@ -98,9 +98,8 @@ public:
 	} m_Latency;
 	
 	//zCatch:
-	enum { ZCATCH_NOT_CAUGHT = -1 };
 	int m_CaughtBy;
-	int m_SpecExplicit;
+	bool m_SpecExplicit;
 	int m_Deaths;
 	int m_Kills;
 	int m_LastKillTry;
@@ -114,6 +113,25 @@ public:
 	int m_CampTick;
 	vec2 m_CampPos;
 	
+	// zCatch/TeeVi
+	enum
+	{
+		ZCATCH_NOT_CAUGHT = -1,
+		ZCATCH_RELEASE_ALL = -1
+	};
+	struct CZCatchVictim
+	{
+		int ClientID;
+		CZCatchVictim *prev;
+	};
+	CZCatchVictim *m_ZCatchVictims;
+	int m_zCatchNumVictims;
+	int m_zCatchNumKillsInARow;
+	void AddZCatchVictim(int ClientID);
+	void ReleaseZCatchVictim(int ClientID, int limit = 0);
+	bool HasZCatchVictims() { return (m_ZCatchVictims != NULL); }
+	int LastZCatchVictim() { return HasZCatchVictims() ? m_ZCatchVictims->ClientID : -1; }
+	
 private:
 	CCharacter *m_pCharacter;
 	CGameContext *m_pGameServer;