Transifex autosync

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / common.qc

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index c2e039f753d952015d0c69f7b7b046ed762e1ad7..6138bd8b5b4734ed0222d0eedbbcade4b2904aeb 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -187,6 +187,10 @@ void timeout_handler_reset(entity this)
        timeout_leadtime = 0;
 
        delete(this);
+
+       // ReadyCount() does nothing when a timeout is active or pending
+       // so check readiness now to support g_warmup_allow_timeout
+       if (warmup_stage) ReadyCount();
 }
 
 void timeout_handler_think(entity this)
@@ -347,7 +351,7 @@ void CommonCommand_editmob(int request, entity caller, int argc)
                                        string mon_oldname = mon.monster_name;
 
                                        mon.monster_name = argument;
-                                       if (mon.sprite)   WaypointSprite_UpdateSprites(mon.sprite, WP_Monster, WP_Null, WP_Null);
+                                       if (mon.sprite)   WaypointSprite_UpdateSprites(mon.sprite, WP_Monster, WP_Null, WP_Null); // TODO: the new name is never actually sent to CSQC!
                                        print_to(caller, sprintf("Your pet '%s' is now known as '%s'", mon_oldname, mon.monster_name));
                                        return;
                                }
@@ -664,6 +668,7 @@ void CommonCommand_timein(int request, entity caller)
                                                        timeout_status = TIMEOUT_INACTIVE;
                                                        timeout_time = 0;
                                                        timeout_handler.nextthink = time;  // timeout_handler has to take care of it immediately
+                                                       Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_TIMEOUT);
                                                        bprint(strcat("^7The timeout was aborted by ", GetCallerName(caller), " !\n"));
                                                        return;
                                                }