Merge branch 'bones_was_here/vidsettings' into 'master'

[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 181a920b3f157867da1a6ab5d103070d667dff8e..056a8e9e6ec7dae7efb4356cc4a2cf8b63f047d3 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -168,17 +168,6 @@ entity GetFilteredEntity(string input)
        return selection;
 }
 
-// same thing, but instead return their edict number
-float GetFilteredNumber(string input)
-{
-       entity selection = GetFilteredEntity(input);
-       float output;
-
-       output = etof(selection);
-
-       return output;
-}
-
 // switch between sprint and print depending on whether the receiver is the server or a player
 void print_to(entity to, string input)
 {
@@ -599,8 +588,8 @@ void CommonCommand_records(int request, entity caller)
                case CMD_REQUEST_USAGE:
                {
                        print_to(caller, strcat("\nUsage:^3 ", GetCommandPrefix(caller), " records [<pagenum>]"));
-                       print_to(caller, "  Without arguments it prints all records for the current gametype,");
-                       print_to(caller, "  otherwise it only prints page <pagenum> (50 records per page),");
+                       print_to(caller, "  Without arguments it prints all records (all pages) for the current gametype,");
+                       print_to(caller, "  otherwise if there are multiple pages it only prints page <pagenum> (1..10),");
                        return;
                }
        }
@@ -675,6 +664,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;
                                                }