From: Samual Date: Fri, 30 Dec 2011 16:10:52 +0000 (-0500) Subject: Fix some things with timeout X-Git-Tag: xonotic-v0.6.0~188^2~28^2~15 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=592a5b76f6be967cc59ec192fb65ec8cb81115bd;p=xonotic%2Fxonotic-data.pk3dir.git Fix some things with timeout --- diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index fd516c19d..83dcc1e54 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -538,7 +538,7 @@ void CommonCommand_timein(float request, entity caller) timeout_status = TIMEOUT_INACTIVE; timeout_time = 0; timeout_handler.nextthink = time; // timeout_handler has to take care of it immediately - bprint(strcat("^7The timeout was aborted by ", caller.netname, " !\n")); + bprint(strcat("^7The timeout was aborted by ", GetCallerName(caller), " !\n")); return; } @@ -546,7 +546,7 @@ void CommonCommand_timein(float request, entity caller) { timeout_time = autocvar_sv_timeout_resumetime; timeout_handler.nextthink = time; // timeout_handler has to take care of it immediately - bprint(strcat("^1Attention: ^7", caller.netname, " resumed the game! Prepare for battle!\n")); + bprint(strcat("^1Attention: ^7", GetCallerName(caller), " resumed the game! Prepare for battle!\n")); return; } diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index d3ee9cc27..3ed82b7dd 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -15,7 +15,7 @@ #define TIMEOUT_ACTIVE 2 // timeout which pauses the game by setting the slowmo value extremely low. -#define TIMEOUT_SLOWMO_VALUE 0.0001 +#define TIMEOUT_SLOWMO_VALUE 0.000001 // global timeout information declarations entity timeout_caller; // contains the entity of the player who started the last timeout