about summary refs log tree commit diff
path: root/src/game/server/gamemodes/zcatch.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server/gamemodes/zcatch.h')
-rw-r--r--src/game/server/gamemodes/zcatch.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/game/server/gamemodes/zcatch.h b/src/game/server/gamemodes/zcatch.h
index cb01ff8b..4f110a03 100644
--- a/src/game/server/gamemodes/zcatch.h
+++ b/src/game/server/gamemodes/zcatch.h
@@ -1,13 +1,13 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
-/* zCatch by erd and Teetime */
+/* zCatch by erd and Teetime                                                                 */
 
 #ifndef GAME_SERVER_GAMEMODES_ZCATCH_H
 #define GAME_SERVER_GAMEMODES_ZCATCH_H
 
 #include <game/server/gamecontroller.h>
 
-class CGameController_zCatch : public IGameController
+class CGameController_zCatch: public IGameController
 {
 	int m_OldMode;
 
@@ -15,17 +15,13 @@ public:
 	CGameController_zCatch(class CGameContext *pGameServer);
 	virtual void Tick();
 	virtual void DoWincheck();
-	virtual bool IsZCatch();
-
-	enum
-	{
-		ZCATCH_NOT_CAUGHT = -1,
-	}; 
 
 	virtual void StartRound();
 	virtual void OnCharacterSpawn(class CCharacter *pChr);
 	virtual void OnPlayerInfoChange(class CPlayer *pP);
 	virtual int OnCharacterDeath(class CCharacter *pVictim, class CPlayer *pKiller, int WeaponID);
+	virtual bool OnEntity(int Index, vec2 Pos);
+	virtual bool CanChangeTeam(CPlayer *pPlayer, int JoinTeam);
 	virtual void EndRound();
 };