From dd21ae1bc7a648138d33727628983a3b25a07570 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 19 Jan 2008 10:57:25 +0000 Subject: large commit. documented a bit. editor updates. general cleanup of everything --- src/game/server/gs_game.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/game/server/gs_game.cpp') 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 #include +#include #include #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) -- cgit 1.4.1