about summary refs log tree commit diff
path: root/src/game/server/gamecontroller.h
diff options
context:
space:
mode:
authorTeetime <TeetimeTW@yahoo.de>2013-01-12 07:59:20 +0100
committerTeetime <TeetimeTW@yahoo.de>2013-01-12 07:59:20 +0100
commit90770bc12e3266cf428b66abbbd4d6bb85a5bc55 (patch)
tree6a51446a4a1ea4ca73ce61bd97bb4bad5a48c431 /src/game/server/gamecontroller.h
parent198122516365d17a489cc86f205d44cc0008f99d (diff)
downloadzcatch-90770bc12e3266cf428b66abbbd4d6bb85a5bc55.tar.gz
zcatch-90770bc12e3266cf428b66abbbd4d6bb85a5bc55.zip
Refactored some things, corrected indentation etc..
Diffstat (limited to 'src/game/server/gamecontroller.h')
-rw-r--r--src/game/server/gamecontroller.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/server/gamecontroller.h b/src/game/server/gamecontroller.h
index 1be24509..fbf6ae79 100644
--- a/src/game/server/gamecontroller.h
+++ b/src/game/server/gamecontroller.h
@@ -12,13 +12,13 @@
 */
 class IGameController
 {
+protected:
 	vec2 m_aaSpawnPoints[3][64];
 	int m_aNumSpawnPoints[3];
 
 	class CGameContext *m_pGameServer;
 	class IServer *m_pServer;
 
-protected:
 	CGameContext *GameServer() const { return m_pGameServer; }
 	IServer *Server() const { return m_pServer; }
 
@@ -138,12 +138,10 @@ public:
 	virtual int GetAutoTeam(int NotThisID);
 	virtual bool CanJoinTeam(int Team, int NotThisID);
 	bool CheckTeamBalance();
-	bool CanChangeTeam(CPlayer *pPplayer, int JoinTeam);
+	virtual bool CanChangeTeam(CPlayer *pPlayer, int JoinTeam);
 	int ClampTeam(int Team);
 
 	virtual void PostReset();
-	
-	virtual bool IsZCatch();
 };
 
 #endif