diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-04 23:58:22 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-04 23:58:22 +0000 |
| commit | f7b5cfc67284768e2ba4c30f5e63a49b64d29e01 (patch) | |
| tree | aabcce334f90dcd8d3b8368851ae568b2f8202a3 /src/game/server/srv_common.h | |
| parent | 018abbdd0a770cde38035fe44e0dcef55b2d4b50 (diff) | |
| download | zcatch-f7b5cfc67284768e2ba4c30f5e63a49b64d29e01.tar.gz zcatch-f7b5cfc67284768e2ba4c30f5e63a49b64d29e01.zip | |
fixed restart command
Diffstat (limited to 'src/game/server/srv_common.h')
| -rw-r--r-- | src/game/server/srv_common.h | 11 |
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; |