]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some things with timeout
authorSamual <samual@xonotic.org>
Fri, 30 Dec 2011 16:10:52 +0000 (11:10 -0500)
committerSamual <samual@xonotic.org>
Fri, 30 Dec 2011 16:10:52 +0000 (11:10 -0500)
qcsrc/server/command/common.qc
qcsrc/server/command/common.qh

index fd516c19da05481dc14a86c2ae212829e36c3a43..83dcc1e5401cffaf49c8b864faa75436db18a594 100644 (file)
@@ -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;
                                                }
                                                
index d3ee9cc27d3692f7a3074789eed462208928c1d1..3ed82b7dd2f28f9fa6f2d7436b1e3d0ee321ff63 100644 (file)
@@ -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