From f7b5cfc67284768e2ba4c30f5e63a49b64d29e01 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Thu, 4 Oct 2007 23:58:22 +0000 Subject: fixed restart command --- src/game/server/srv_common.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/game/server/srv_common.h') 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; -- cgit 1.4.1