about summary refs log tree commit diff
path: root/src/game/server/gamecontroller.hpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-31 14:37:35 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-08-31 14:37:35 +0000
commit0a48454a554f8aa221a54b694b32b3004b9f6fd7 (patch)
treec114ff110c99468f236c51cae51c191e74a049da /src/game/server/gamecontroller.hpp
parent5198d6bf016014dd85c96ebd97147fa3f24bcc7a (diff)
downloadzcatch-0a48454a554f8aa221a54b694b32b3004b9f6fd7.tar.gz
zcatch-0a48454a554f8aa221a54b694b32b3004b9f6fd7.zip
removed the GAMETYPE_ enum
Diffstat (limited to 'src/game/server/gamecontroller.hpp')
-rw-r--r--src/game/server/gamecontroller.hpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/server/gamecontroller.hpp b/src/game/server/gamecontroller.hpp
index 9006f985..1a87034b 100644
--- a/src/game/server/gamecontroller.hpp
+++ b/src/game/server/gamecontroller.hpp
@@ -35,6 +35,8 @@ protected:
 	void cyclemap();
 	void resetgame();
 	
+	const char *gametype;
+	
 	int round_start_tick;
 	int game_over_tick;
 	int sudden_death;
@@ -44,10 +46,11 @@ protected:
 	int warmup;
 	int round_count;
 	
+	int game_flags;
+	
 	
 public:
-	int gametype;
-	bool is_teamplay;
+	bool is_teamplay() const;
 	
 	GAMECONTROLLER();