1 files changed, 5 insertions, 6 deletions
diff --git a/src/game/server/srv_common.h b/src/game/server/srv_common.h
index f01dd39c..21941f06 100644
--- a/src/game/server/srv_common.h
+++ b/src/game/server/srv_common.h
@@ -109,9 +109,8 @@ extern game_world *world;
 class gameobject : public entity
 {
 protected:
+	void cyclemap();
 	void resetgame();
-	void startround();
-	void endround();
 	
 	int round_start_tick;
 	int game_over_tick;
@@ -124,6 +123,10 @@ protected:
 public:
 	int gametype;
 	gameobject();
+
+	void startround();
+	void endround();
+
 	virtual void post_reset();
 	virtual void tick();
 	
@@ -160,10 +163,6 @@ public:
 	enum
 	{
 		PROJECTILE_FLAGS_EXPLODE = 1 << 0,
-		
-		WEAPON_PROJECTILETYPE_GUN		= 0,
-		WEAPON_PROJECTILETYPE_ROCKET	= 1,
-		WEAPON_PROJECTILETYPE_SHOTGUN	= 2,
 	};
 	
 	vec2 vel;