large commit with loads of clean up. more is comming

1 files changed, 8 insertions, 8 deletions

diff --git a/src/game/server/gs_game_ctf.h b/src/game/server/gs_game_ctf.h
index 107c000d..6d512815 100644
--- a/src/game/server/gs_game_ctf.h
+++ b/src/game/server/gs_game_ctf.h
@@ -1,26 +1,26 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
 // game object
-class gameobject_ctf : public gameobject
+class GAMECONTROLLER_CTF : public GAMECONTROLLER
 {
 public:
-	class flag *flags[2];
+	class FLAG *flags[2];
 	
-	gameobject_ctf();
+	GAMECONTROLLER_CTF();
 	virtual void tick();
 	
 	virtual bool on_entity(int index, vec2 pos);
 	
-	virtual void on_player_spawn(class player *p);
-	virtual int on_player_death(class player *victim, class player *killer, int weapon);
+	virtual void on_player_spawn(class PLAYER *p);
+	virtual int on_player_death(class PLAYER *victim, class PLAYER *killer, int weapon);
 };
 
 // TODO: move to seperate file
-class flag : public entity
+class FLAG : public ENTITY
 {
 public:
 	static const int phys_size = 14;
-	player *carrying_player;
+	PLAYER *carrying_player;
 	vec2 vel;
 	vec2 stand_pos;
 	
@@ -28,7 +28,7 @@ public:
 	int at_stand;
 	int drop_tick;
 	
-	flag(int _team);
+	FLAG(int _team);
 
 	virtual void reset();
 	virtual void snap(int snapping_client);