diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-19 10:57:25 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-19 10:57:25 +0000 |
| commit | dd21ae1bc7a648138d33727628983a3b25a07570 (patch) | |
| tree | caf87523cda90c3a0fb235ea6e642765136d3f88 /src/game/server/gs_game.cpp | |
| parent | 4eb71856948077b4c0cf9b5ef7178075433b7259 (diff) | |
| download | zcatch-dd21ae1bc7a648138d33727628983a3b25a07570.tar.gz zcatch-dd21ae1bc7a648138d33727628983a3b25a07570.zip | |
large commit. documented a bit. editor updates. general cleanup of everything
Diffstat (limited to 'src/game/server/gs_game.cpp')
| -rw-r--r-- | src/game/server/gs_game.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/server/gs_game.cpp b/src/game/server/gs_game.cpp index 2d44a499..14b5a2c7 100644 --- a/src/game/server/gs_game.cpp +++ b/src/game/server/gs_game.cpp @@ -1,6 +1,7 @@ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */ #include <string.h> #include <engine/e_config.h> +#include <engine/e_server_interface.h> #include <game/g_mapitems.h> #include "gs_common.h" @@ -190,7 +191,7 @@ int gameobject::on_player_death(class player *victim, class player *killer, int void gameobject::do_warmup(int seconds) { - warmup = seconds*SERVER_TICK_SPEED; + warmup = seconds*server_tickspeed(); } bool gameobject::is_friendly_fire(int cid1, int cid2) |