]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/command/sv_cmd.qc
Compatibility with 0.5 for voting, plus fix player/world entity for common commands
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / sv_cmd.qc
index 622fa2e88800637ff79f0fd543fef95116265354..34075853d7c52454bcdb9a3534c4864c9cc74f09 100644 (file)
@@ -1,12 +1,8 @@
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: December 6th, 2011
+//  Last updated: December 28th, 2011
 // =====================================================
 
-// ============================
-//  Misc. Supporting Functions
-// ============================
-
 //  used by GameCommand_make_mapinfo()
 void make_mapinfo_Think()
 {
@@ -65,94 +61,78 @@ void changematchtime(float delta, float mi, float ma)
        cvar_set("timelimit", ftos(new / 60));
 }
 
-//  used by GameCommand_modelbug() // TODO: is this even needed?
-float g_clientmodel_genericsendentity (entity to, float sf);
-void modelbug_make_svqc();
-void modelbug_make_csqc()
-{
-       Net_LinkEntity(self, TRUE, 0, g_clientmodel_genericsendentity);
-       self.think = modelbug_make_svqc;
-       self.nextthink = time + 1;
-       setorigin(self, self.origin - '0 0 8');
-}
-void modelbug_make_svqc()
-{
-       self.SendEntity = func_null;
-       self.think = modelbug_make_csqc;
-       self.nextthink = time + 1;
-       setorigin(self, self.origin + '0 0 8');
-}
-void modelbug()
-{
-       entity e;
-       e = spawn();
-       setorigin(e, nextent(world).origin);
-       precache_model("models_portal.md3");
-       setmodel(e, "models/portal.md3");
-       e.think = modelbug_make_svqc;
-       e.nextthink = time + 1;
-}
-
 
 // =======================
 //  Command Sub-Functions
 // =======================
 
-void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer
+void GameCommand_adminmsg(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
-                       float entno = stof(argv(1)); 
-                       float n, i;
-                       string s;
+                       float accepted;
                        
-                       if(argc >= 3 && argc <= 4) {
-                               if((entno < 0) | (entno > maxclients)) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               n = 0;
-                               for(i = (entno ? entno : 1); i <= (entno ? entno : maxclients); ++i)
+                       string targets = strreplace(",", " ", argv(1));
+                       string original_targets = strreplace(" ", ", ", targets);
+                       string admin_message = argv(2);
+                       float infobartime = stof(argv(3));
+                       
+                       string successful, t;
+                       
+                       if((targets) && (admin_message))
+                       {
+                               for(;targets;)
                                {
-                                       client = edict_num(i);
-                                       if(client.flags & FL_CLIENT)
+                                       t = car(targets); targets = cdr(targets);
+                                       
+                                       // Check to see if the player is a valid target
+                                       client = GetFilteredEntity(t);
+                                       accepted = VerifyClientEntity(client, TRUE, FALSE);
+                                       
+                                       if not(accepted > 0) 
                                        {
-                                               if(argc == 4)
-                                               {
-                                                       // make the string console safe
-                                                       s = argv(2);
-                                                       s = strreplace("\n", "", s);
-                                                       s = strreplace("\\", "\\\\", s);
-                                                       s = strreplace("$", "$$", s);
-                                                       s = strreplace("\"", "\\\"", s);
-                                                       stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", stof(argv(3)), s));
-                                               }
-                                               else
-                                               {
-                                                       centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
-                                                       sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
-                                               }
-                                               dprint("Message sent to ", client.netname, "\n");
-                                               ++n;
+                                               print("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); 
+                                               continue;
+                                       }
+                                       
+                                       // send the centerprint/console print or infomessage
+                                       if(infobartime)
+                                       {
+                                               stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", infobartime, MakeConsoleSafe(admin_message)));
+                                       }
+                                       else
+                                       {
+                                               centerprint(client, strcat("^3", admin_name(), ":\n^7", admin_message));
+                                               sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", admin_message, "\n"));
                                        }
+                                       
+                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
+                                       dprint("Message sent to ", client.netname, "\n");
+                                       continue;
                                }
-                               if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } 
+                               
+                               if(successful)
+                                       bprint("Successfully sent message '", admin_message, "' to ", successful, ".\n");
+                               else
+                                       print("No players given (", original_targets, ") could recieve the message.\n");
+                                       
                                return;
                        }
                }
                
                default:
                        print("Incorrect parameters for ^2adminmsg^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd adminmsg clientnumber \"message\" [infobartime]\n");
+                       print("\nUsage:^3 sv_cmd adminmsg clients \"message\" [infobartime]\n");
+                       print("  'clients' is a list (separated by commas) of player entity ID's or nicknames\n");
                        print("  If infobartime is provided, the message will be sent to infobar.\n");
                        print("  Otherwise, it will just be sent as a centerprint message.\n");
-                       print("Examples: adminmsg 4 \"this infomessage will last for ten seconds\" 10\n");
-                       print("          adminmsg 2 \"this message will be a centerprint\"\n");
+                       print("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10\n");
+                       print("          adminmsg 2,5 \"this message will be a centerprint\"\n");
                        return;
                }
        }
@@ -162,14 +142,14 @@ void GameCommand_allready(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        ReadyRestart();
                        return;
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd allready\n");
                        print("  No arguments required.\n");
@@ -182,7 +162,7 @@ void GameCommand_allspec(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
                        string reason = argv(1);
@@ -200,7 +180,7 @@ void GameCommand_allspec(float request, float argc)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd allspec [reason]\n");
                        print("  Where 'reason' is an optional argument for explanation of allspec command.\n");
@@ -210,45 +190,43 @@ void GameCommand_allspec(float request, float argc)
        }
 }
 
-void GameCommand_anticheat(float request, float argc)
+void GameCommand_anticheat(float request, float argc) 
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       entity client;
-                       float entno = stof(argv(1)); 
+                       entity client = GetFilteredEntity(argv(1));
+                       float accepted = VerifyClientEntity(client, FALSE, FALSE);
                        
-                       if((entno < 1) | (entno > maxclients)) {
-                               print("Player ", argv(1), " doesn't exist\n");
+                       if(accepted > 0) 
+                       {
+                               self = client;
+                               anticheat_report();
                                return;
                        }
-                       client = edict_num(entno);
-                       if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) {
-                               print("Player ", client.netname, " is not active\n");
-                               return;
+                       else
+                       {
+                               print("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n"); 
                        }
-                       self = client;
-                       anticheat_report();
-                       return;
                }
                        
                default:
                        print("Incorrect parameters for ^2anticheat^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd anticheat clientnumber\n");
-                       print("  where 'clientnumber' is player entity number.\n");
+                       print("\nUsage:^3 sv_cmd anticheat client\n");
+                       print("  'client' is the entity number or name of the player.\n");
                        return;
                }
        }
 }
 
-void GameCommand_bbox(float request)
+void GameCommand_bbox(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z));
                        print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n");
@@ -327,7 +305,7 @@ void GameCommand_bbox(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd bbox\n");
                        print("  No arguments required.\n");
@@ -337,11 +315,11 @@ void GameCommand_bbox(float request)
        }
 }
 
-void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
+void GameCommand_bot_cmd(float request, float argc) // mostly legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity bot;
                        
@@ -424,13 +402,13 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
                        
                default:
                        print("Incorrect parameters for ^2bot_cmd^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd bot_cmd client command [argument]\n");
                        print("  'client' can be either the name or entity id of the bot\n");
                        print("  For full list of commands, see bot_cmd help [command].\n");
-                       print("Examples: bot_cmd <id> cc \"say something\"\n");
-                       print("          bot_cmd <id> presskey jump\n");
+                       print("Examples: sv_cmd bot_cmd client cc \"say something\"\n");
+                       print("          sv_cmd bot_cmd client presskey jump\n");
                        return;
                }
        }
@@ -440,7 +418,7 @@ void GameCommand_cointoss(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
                        string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n");
@@ -454,7 +432,7 @@ void GameCommand_cointoss(float request, float argc)
                }
                
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n");
                        print("  Where 'result1' and 'result2' are user created options.\n");
@@ -463,53 +441,11 @@ void GameCommand_cointoss(float request, float argc)
        }
 }
 
-void GameCommand_cvar_changes(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(cvar_changes);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd cvar_changes\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2cvar_purechanges^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_cvar_purechanges(float request)
+void GameCommand_database(float request, float argc) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(cvar_purechanges);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd cvar_purechanges\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2cvar_changes^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_database(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(argc == 3)
                        {
@@ -537,7 +473,7 @@ void GameCommand_database(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2database^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd database action filename\n");
                        print("  Where 'action' is the command to complete,\n");
@@ -552,39 +488,33 @@ void GameCommand_defer_clear(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
-                       float entno = stof(argv(1));
+                       float accepted;
                        
                        if(argc == 2)
                        {
-                               // player_id is out of range
-                               if((entno < 1) | (entno > maxclients)) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               client = edict_num(entno);
-                               if not(client.flags & FL_CLIENT) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               if(clienttype(client) == CLIENTTYPE_BOT) {
-                                       print("Player ", argv(1), " (", client.netname, ") is a bot\n");
-                                       return;
+                               client = GetFilteredEntity(argv(1));
+                               accepted = VerifyClientEntity(client, TRUE, FALSE);
+                               
+                               if(accepted > 0)
+                               {
+                                       stuffcmd(client, "defer clear\n");
+                                       print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
                                }
-                               stuffcmd(client, "defer clear\n");
-                               print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
+                               else { print("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); }
+                               
                                return;
                        }
                }
                
                default:
                        print("Incorrect parameters for ^2defer_clear^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd defer_clear clientnumber\n");
-                       print("  where 'clientnumber' is player entity number.\n");
+                       print("\nUsage:^3 sv_cmd defer_clear client\n");
+                       print("  'client' is the entity number or name of the player.\n");
                        print("See also: ^2defer_clear_all^7\n");
                        return;
                }
@@ -595,7 +525,7 @@ void GameCommand_defer_clear_all(float request)
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
                        float i;
@@ -604,7 +534,7 @@ void GameCommand_defer_clear_all(float request)
                        FOR_EACH_CLIENT(client)
                        {
                                argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client))));
-                               GameCommand_defer_clear(GC_REQUEST_COMMAND, argc);      
+                               GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc);     
                                ++i;
                        }
                        if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? 
@@ -612,7 +542,7 @@ void GameCommand_defer_clear_all(float request)
                }
                
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd defer_clear_all\n");
                        print("  No arguments required.\n");
@@ -622,11 +552,11 @@ void GameCommand_defer_clear_all(float request)
        }
 }
 
-void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
+void GameCommand_delrec(float request, float argc) // legacy // perhaps merge later with records and printstats and such?
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(argv(1))
                        {
@@ -640,7 +570,7 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge
                
                default:
                        print("Incorrect parameters for ^2delrec^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd delrec ranking [map]\n");
                        print("  'ranking' is which ranking level to clear up to, \n");
@@ -651,11 +581,11 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge
        }
 }
 
-void GameCommand_effectindexdump(float request)
+void GameCommand_effectindexdump(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        float fh, d;
                        string s;
@@ -720,7 +650,7 @@ void GameCommand_effectindexdump(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd effectindexdump\n");
                        print("  No arguments required.\n");
@@ -729,18 +659,18 @@ void GameCommand_effectindexdump(float request)
        }
 }
 
-void GameCommand_extendmatchtime(float request)
+void GameCommand_extendmatchtime(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+                       changematchtime(autocvar_timelimit_increment * 60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
                        return;
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd extendmatchtime\n");
                        print("  No arguments required.\n");
@@ -750,11 +680,11 @@ void GameCommand_extendmatchtime(float request)
        }
 }
 
-void GameCommand_find(float request, float argc)
+void GameCommand_find(float request, float argc) // legacy // is this even needed? We have prvm_edicts command and such ANYWAY
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity client;
                        
@@ -766,7 +696,7 @@ void GameCommand_find(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2find^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd find classname\n");
                        print("  Where 'classname' is the classname to search for.\n");
@@ -775,11 +705,11 @@ void GameCommand_find(float request, float argc)
        }
 }
 
-void GameCommand_gametype(float request, float argc)
+void GameCommand_gametype(float request, float argc) // legacy
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        string s = argv(1);
                        float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
@@ -804,7 +734,7 @@ void GameCommand_gametype(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2gametype^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd gametype mode\n");
                        print("  Where 'mode' is the gametype mode to switch to.\n");
@@ -814,11 +744,11 @@ void GameCommand_gametype(float request, float argc)
        }
 }
 
-void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit)
+void GameCommand_gettaginfo(float request, float argc) // legacy
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        entity tmp_entity;
                        float i;
@@ -865,23 +795,22 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini
                        
                default:
                        print("Incorrect parameters for ^2gettaginfo^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd gettaginfo\n");
-                       print("  FIXME: Arguments currently unknown\n");
+                       print("\nUsage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n");
                        print("See also: ^2bbox^7\n");
                        return;
                }
        }
 }
 
-void GameCommand_gotomap(float request, float argc)
+void GameCommand_gotomap(float request, float argc) // mostly legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       if(argc == 2)
+                       if(argv(1))
                        {
                                print(GotoMap(argv(1)), "\n");
                                return;
@@ -890,7 +819,7 @@ void GameCommand_gotomap(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2gotomap^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd gotomap map\n");
                        print("  Where 'map' is the *.bsp file to change to.\n");
@@ -900,31 +829,11 @@ void GameCommand_gotomap(float request, float argc)
        }
 }
 
-void GameCommand_ladder(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(ladder_reply);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd ladder\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
 void GameCommand_lockteams(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(teamplay)
                        {
@@ -939,7 +848,7 @@ void GameCommand_lockteams(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd lockteams\n");
                        print("  No arguments required.\n");
@@ -949,24 +858,24 @@ void GameCommand_lockteams(float request)
        }
 }
 
-void GameCommand_make_mapinfo(float request) // UNTESTED
+void GameCommand_make_mapinfo(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                { 
                        entity tmp_entity;
                        
                        tmp_entity = spawn();
                        tmp_entity.classname = "make_mapinfo";
                        tmp_entity.think = make_mapinfo_Think;
-                       tmp_entity.nextthink = time; // this sucks... todo: re-write this -- Use initializeentity later
+                       tmp_entity.nextthink = time;
                        MapInfo_Enumerate();
                        return;
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd make_mapinfo\n");
                        print("  No arguments required.\n");
@@ -975,32 +884,13 @@ void GameCommand_make_mapinfo(float request) // UNTESTED
        }
 }
 
-void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore? 
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       modelbug();
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd modelbug\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
 void GameCommand_moveplayer(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
+                       float accepted;
                        entity client;
        
                        string targets = strreplace(",", " ", argv(1));
@@ -1018,15 +908,12 @@ void GameCommand_moveplayer(float request, float argc)
                                        t = car(targets); targets = cdr(targets);
 
                                        // Check to see if the player is a valid target
-                                       if((GetFilteredNumber(t) < 1) || (GetFilteredNumber(t) > maxclients)) // player_id is out of range
-                                       {
-                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (out of range)", (targets ? ", skipping to next player.\n" : ".\n"));
-                                               continue; 
-                                       }
-                                       client = edict_num(GetFilteredNumber(t));
-                                       if not(client.flags & FL_CLIENT) // player entity is not a client
+                                       client = GetFilteredEntity(t);
+                                       accepted = VerifyClientEntity(client, FALSE, FALSE);
+                                       
+                                       if not(accepted > 0) 
                                        {
-                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (not a client)", (targets ? ", skipping to next player.\n" : ".\n"));
+                                               print("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); 
                                                continue;
                                        }
                                        
@@ -1118,28 +1005,28 @@ void GameCommand_moveplayer(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2moveplayer^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd moveplayer clientnumbers destination [notify]\n");
-                       print("  'clientnumbers' is a list (separated by commas) of player entity ID's\n");
+                       print("\nUsage:^3 sv_cmd moveplayer clients destination [notify]\n");
+                       print("  'clients' is a list (separated by commas) of player entity ID's or nicknames\n");
                        print("  'destination' is what to send the player to, be it team or spectating\n");
                        print("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n");
                        print("  'notify' is whether or not to send messages notifying of the move. Detail below.\n");
                        print("    0 (00) automove centerprint, admin message; 1 (01) automove centerprint, no admin message\n");
                        print("    2 (10) no centerprint, admin message; 3 (11) no centerprint, no admin message\n");
-                       print("Examples: moveplayer 1,3,5 red 3\n");
-                       print("          moveplayer 2 spec \n");
+                       print("Examples: sv_cmd moveplayer 1,3,5 red 3\n");
+                       print("          sv_cmd moveplayer 2 spec \n");
                        print("See also: ^2allspec, shuffleteams^7\n");
                        return;
                }
        }
 }
 
-void GameCommand_nospectators(float request)
+void GameCommand_nospectators(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        blockSpectators = 1;
                        entity plr;
@@ -1156,7 +1043,7 @@ void GameCommand_nospectators(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd nospectators\n");
                        print("  No arguments required.\n");
@@ -1165,113 +1052,92 @@ void GameCommand_nospectators(float request)
        }
 }
 
-void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead....
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       onslaught_updatelinks();
-                       print("ONS links updated\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd onslaught_updatelinks\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_playerdemo(float request, float argc) // UNTESTED
+void GameCommand_playerdemo(float request, float argc) // mostly legacy
 {      
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       entity client;
-                       float i, n, entno;
-                       string s;
-                       
-                       switch(argv(1))
+                       if(argv(2) && argv(3))
                        {
-                               case "read":
+                               entity client;
+                               float i, n, accepted;
+                               
+                               switch(argv(1))
                                {
-                                       // TODO: Create a general command for looking this up, save a lot of space everywhere in this file
-                                       entno = GetFilteredNumber(argv(2));
-                                       if((entno < 1) | (entno > maxclients)) {
-                                               print("Player ", argv(2), " doesn't exist\n");
+                                       case "read":
+                                       {
+                                               client = GetFilteredEntity(argv(2));
+                                               accepted = VerifyClientEntity(client, FALSE, TRUE);
+                                               
+                                               if not(accepted > 0) 
+                                               {
+                                                       print("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n"); 
+                                                       return;
+                                               }
+                                               
+                                               self = client;
+                                               playerdemo_open_read(argv(3));
                                                return;
                                        }
-                                       client = edict_num(entno);
-                                       if(clienttype(client) != CLIENTTYPE_BOT) {
-                                               print("Player ", client.netname, " is not a bot\n");
+                                       
+                                       case "write":
+                                       {
+                                               client = GetFilteredEntity(argv(2));
+                                               accepted = VerifyClientEntity(client, FALSE, FALSE);
+                                               
+                                               if not(accepted > 0) 
+                                               {
+                                                       print("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n"); 
+                                                       return;
+                                               }
+                                               
+                                               self = client;
+                                               playerdemo_open_write(argv(3));
                                                return;
                                        }
-                                       self = client;
-                                       playerdemo_open_read(argv(3));
-                                       return;
-                               }
-                               
-                               case "write":
-                               {
-                                       entno = GetFilteredNumber(argv(2));
-                                       if((entno < 1) | (entno > maxclients)) {
-                                               print("Player ", argv(2), " doesn't exist\n");
+                                       
+                                       case "auto_read_and_write":
+                                       {
+                                               n = GetFilteredNumber(argv(3));
+                                               cvar_set("bot_number", ftos(n));
+                                               
+                                               localcmd("wait; wait; wait\n");
+                                               for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); }
+                                               
+                                               localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n");
+                                               return;
+                                       }
+                                       
+                                       case "auto_read":
+                                       {
+                                               n = GetFilteredNumber(argv(3));
+                                               cvar_set("bot_number", ftos(n));
+                                               
+                                               localcmd("wait; wait; wait\n");
+                                               for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); }
                                                return;
                                        }
-                                       client = edict_num(entno);
-                                       self = client;
-                                       playerdemo_open_write(argv(3));
-                                       return;
-                               }
-                               
-                               case "auto_read_and_write":
-                               {
-                                       s = argv(2);
-                                       n = GetFilteredNumber(argv(3));
-                                       cvar_set("bot_number", ftos(n));
-                                       localcmd("wait; wait; wait\n");
-                                       for(i = 0; i < n; ++i)
-                                               localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n");
-                                       localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n");
-                                       return;
-                               }
-                               
-                               case "auto_read":
-                               {
-                                       s = argv(2);
-                                       n = GetFilteredNumber(argv(3));
-                                       cvar_set("bot_number", ftos(n));
-                                       localcmd("wait; wait; wait\n");
-                                       for(i = 0; i < n; ++i)
-                                               localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n");
-                                       return;
                                }
-                               
-                               return;
                        }
                }
                        
                default:
-                       print("Incorrect parameters for ^2radarmap^7\n");
-               case GC_REQUEST_USAGE:
+                       print("Incorrect parameters for ^2playerdemo^7\n");
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd \n");
-                       print("  FIXME: Arguments currently unknown\n");
+                       print("\nUsage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)\n");
+                       print("  Full list of commands here: \"read, write, auto_read_and_write, auto_read.\"\n");
                        return;
                }
        }
 }
 
-void GameCommand_printstats(float request)
+void GameCommand_printstats(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        DumpStats(FALSE);
                        print("stats dumped.\n");
@@ -1279,7 +1145,7 @@ void GameCommand_printstats(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd printstats\n");
                        print("  No arguments required.\n");
@@ -1292,7 +1158,7 @@ void GameCommand_radarmap(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(RadarMap_Make(argc))
                                return;
@@ -1300,7 +1166,7 @@ void GameCommand_radarmap(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2radarmap^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n");
                        print("  The quality factor Q is roughly proportional to the time taken.\n");
@@ -1310,64 +1176,18 @@ void GameCommand_radarmap(float request, float argc)
        }
 }
 
-void GameCommand_rankings(float request) // this is OLD.... jeez.
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       strunzone(rankings_reply);
-                       rankings_reply = strzone(getrankings());
-                       print(rankings_reply);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd rankings\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_records(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       float i;
-                       
-                       for (i = 0; i < 10; ++i)
-                               print(records_reply[i]);
-                               
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd records\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_reducematchtime(float request)
+void GameCommand_reducematchtime(float request) // legacy
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+                       changematchtime(autocvar_timelimit_decrement *-60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
                        return;
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd reducematchtime\n");
                        print("  No arguments required.\n");
@@ -1381,7 +1201,7 @@ void GameCommand_setbots(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(argc >= 2)
                        {
@@ -1394,7 +1214,7 @@ void GameCommand_setbots(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2setbots^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd setbots botnumber\n");
                        print("  Where 'botnumber' is the amount of bots to set bot_number cvar to.\n");
@@ -1408,12 +1228,12 @@ void GameCommand_shuffleteams(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(teamplay)
                        {
-                               entity tmp_player;
-                               float i, x, z, t_teams, t_players, team_color;
+                               entity tmp_player, client;
+                               float i, x, z, t_teams, t_players, team_color, accepted;
 
                                // count the total amount of players and total amount of teams
                                FOR_EACH_PLAYER(tmp_player)
@@ -1464,8 +1284,9 @@ void GameCommand_shuffleteams(float request)
                                                        if not(shuffleteams_players[z])
                                                                continue; // not a player, move on to next random slot
                                                                
-                                                       self = edict_num(shuffleteams_players[z]); // TODO: add sanity checks for this entity to make sure it's okay and not some error.
-                                                               
+                                                       if(VerifyClientNumber(shuffleteams_players[z]))
+                                                               self = edict_num(shuffleteams_players[z]);
+
                                                        if(self.team != team_color) 
                                                                MoveToTeam(self, team_color, 6, 0);
 
@@ -1497,7 +1318,7 @@ void GameCommand_shuffleteams(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd shuffleteams\n");
                        print("  No arguments required.\n");
@@ -1516,24 +1337,20 @@ void GameCommand_stuffto(float request, float argc)
        #ifdef STUFFTO_ENABLED
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       entity client;
-                       float entno;
-                       
-                       if(argc == 3)
+                       if(argv(2))
                        {
-                               entno = GetFilteredNumber(argv(1));
-                               client = world;
-                               if(entno <= maxclients)
-                                       client = edict_num(entno);
-                               if(client.flags & FL_CLIENT)
+                               entity client = GetFilteredEntity(argv(1));
+                               float accepted = VerifyClientEntity(client, TRUE, FALSE);
+                               
+                               if(accepted > 0)
                                {
                                        stuffcmd(client, strcat("\n", argv(2), "\n"));
-                                       print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
+                                       print(strcat("Command: \"", argv(2), "\" sent to ", GetCallerName(client), " (", argv(1) ,").\n"));
                                }
                                else
-                                       print(strcat("Client (", argv(1) ,") not found.\n"));
+                                       print("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); 
                                
                                return;
                        }
@@ -1541,10 +1358,11 @@ void GameCommand_stuffto(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2stuffto^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd stuffto clientnumber command\n");
-                       print("  FIXME: Arguments currently unknown\n");
+                       print("\nUsage:^3 sv_cmd stuffto client \"command\"\n");
+                       print("  'client' is the entity number or name of the player,\n");
+                       print("  and 'command' is the command to be sent to that player.\n");
                        return;
                }
        }
@@ -1557,59 +1375,13 @@ void GameCommand_stuffto(float request, float argc)
        #endif
 }
 
-void GameCommand_teamstatus(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       Score_NicePrint(world);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd teamstatus\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_time(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print("time = ", ftos(time), "\n");
-                       print("frame start = ", ftos(gettime(GETTIME_FRAMESTART)), "\n");
-                       print("realtime = ", ftos(gettime(GETTIME_REALTIME)), "\n");
-                       print("hires = ", ftos(gettime(GETTIME_HIRES)), "\n");
-                       print("uptime = ", ftos(gettime(GETTIME_UPTIME)), "\n");
-                       print("localtime = ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"); // FIXME: Why is strftime broken? is engine problem, I think.
-                       print("gmtime = ", strftime(FALSE, "%a %b %e %H:%M:%S %Z %Y"), "\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd time\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
 void GameCommand_trace(float request, float argc)
-{                                              
+{
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
-                       // TODO: Clean up all of these variables and merge the code below to use only a few
+                       // This is kinda a mess, a lot of it is legacy and thus not rewritten/optimized. 
                        entity e;
                        vector org, delta, start, end, p, q, q0, pos, vv, dv;
                        float i, f, safe, unsafe, dq, dqf;
@@ -1771,10 +1543,10 @@ void GameCommand_trace(float request, float argc)
                        
                default:
                        print("Incorrect parameters for ^2trace^7\n");
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
-                       print("\nUsage:^3 sv_cmd trace command [arguments]\n");
-                       print("  FIXME: Arguments currently unknown\n");
+                       print("\nUsage:^3 sv_cmd trace command (startpos endpos)\n");
+                       print("  Full list of commands here: \"debug, debug2, walk, showline.\"\n");
                        return;
                }
        }
@@ -1784,7 +1556,7 @@ void GameCommand_unlockteams(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(teamplay)
                        {
@@ -1799,7 +1571,7 @@ void GameCommand_unlockteams(float request)
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd unlockteams\n");
                        print("  No arguments required.\n");
@@ -1809,11 +1581,11 @@ void GameCommand_unlockteams(float request)
        }
 }
 
-void GameCommand_warp(float request, float argc)
+void GameCommand_warp(float request, float argc) // mostly legacy
 {
        switch (request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        if(autocvar_g_campaign)
                        {
@@ -1834,7 +1606,7 @@ void GameCommand_warp(float request, float argc)
                }
                
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd level\n");
                        print("  'level' is the level to change campaign mode to.\n");
@@ -1843,19 +1615,20 @@ void GameCommand_warp(float request, float argc)
        }
 }
 
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
 void GameCommand_(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_COMMAND:
+               case CMD_REQUEST_COMMAND:
                {
                        
                        return;
                }
                        
                default:
-               case GC_REQUEST_USAGE:
+               case CMD_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd \n");
                        print("  No arguments required.\n");
@@ -1871,6 +1644,7 @@ void GameCommand_(float request)
 // ==================================
 
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+// Common commands have double indentation to separate them a bit.
 #define SERVER_COMMANDS(request,arguments,command) \
        SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \
        SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \
@@ -1879,8 +1653,6 @@ void GameCommand_(float request)
        SERVER_COMMAND("bbox", GameCommand_bbox(request), "Print detailed information about world size") \
        SERVER_COMMAND("bot_cmd", GameCommand_bot_cmd(request, arguments), "Control and send commands to bots") \
        SERVER_COMMAND("cointoss", GameCommand_cointoss(request, arguments), "Flip a virtual coin and give random result") \
-       SERVER_COMMAND("cvar_changes", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
-       SERVER_COMMAND("cvar_purechanges", GameCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
        SERVER_COMMAND("database", GameCommand_database(request, arguments), "Extra controls of the serverprogs database") \
        SERVER_COMMAND("defer_clear", GameCommand_defer_clear(request, arguments), "Clear all queued defer commands for a specific client") \
        SERVER_COMMAND("defer_clear_all", GameCommand_defer_clear_all(request), "Clear all queued defer commands for all clients") \
@@ -1891,28 +1663,20 @@ void GameCommand_(float request)
        SERVER_COMMAND("gametype", GameCommand_gametype(request, arguments), "Simple command to change the active gametype") \
        SERVER_COMMAND("gettaginfo", GameCommand_gettaginfo(request, arguments), "Get specific information about a weapon model") \
        SERVER_COMMAND("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \
-       SERVER_COMMAND("ladder", GameCommand_ladder(request), "Get information about top players if supported") \
        SERVER_COMMAND("lockteams", GameCommand_lockteams(request), "Disable the ability for players to switch or enter teams") \
        SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
-       SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \
        SERVER_COMMAND("moveplayer", GameCommand_moveplayer(request, arguments), "Change the team/status of a player") \
        SERVER_COMMAND("nospectators", GameCommand_nospectators(request), "Automatically remove spectators from a match") \
-       SERVER_COMMAND("onslaught_updatelinks", GameCommand_onslaught_updatelinks(request), "Refresh link status for onslaught") \
        SERVER_COMMAND("playerdemo", GameCommand_playerdemo(request, arguments), "Control the ability to save demos of players") \
-       SERVER_COMMAND("printstats", GameCommand_printstats(request), "TODO foobar") \
+       SERVER_COMMAND("printstats", GameCommand_printstats(request), "Dump eventlog player stats and other score information") \
        SERVER_COMMAND("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \
-       SERVER_COMMAND("rankings", GameCommand_rankings(request), "Print information about rankings") \
-       SERVER_COMMAND("records", GameCommand_records(request), "List top 10 records for the current map") \
        SERVER_COMMAND("reducematchtime", GameCommand_reducematchtime(request), "Decrease the timelimit value incrementally") \
        SERVER_COMMAND("setbots", GameCommand_setbots(request, arguments), "Adjust how many bots are in the match") \
        SERVER_COMMAND("shuffleteams", GameCommand_shuffleteams(request), "Randomly move players to different teams") \
        SERVER_COMMAND("stuffto", GameCommand_stuffto(request, arguments), "Send a command to be executed on a client") \
-       SERVER_COMMAND("teamstatus", GameCommand_teamstatus(request), "Show information about player and team scores") \
-       SERVER_COMMAND("time", GameCommand_time(request), "Print different formats/readouts of time") \
        SERVER_COMMAND("trace", GameCommand_trace(request, arguments), "Various debugging tools with tracing") \
        SERVER_COMMAND("unlockteams", GameCommand_unlockteams(request), "Enable the ability for players to switch or enter teams") \
        SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \
-       SERVER_COMMAND("vote", VoteCommand(request, world, arguments, command), "Server side control of voting") /* handled in server/vote.qc */ \
        /* nothing */
 
 void GameCommand_macro_help()
@@ -1931,7 +1695,7 @@ float GameCommand_macro_command(float argc, string command)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return TRUE; } }
                
-       SERVER_COMMANDS(GC_REQUEST_COMMAND, argc, command)
+       SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
        #undef SERVER_COMMAND
        
        return FALSE;
@@ -1942,11 +1706,22 @@ float GameCommand_macro_usage(float argc)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return TRUE; } }
                
-       SERVER_COMMANDS(GC_REQUEST_USAGE, argc, "")
+       SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, "")
        #undef SERVER_COMMAND
        
        return FALSE;
 }
+
+void GameCommand_macro_write_aliases(float fh)
+{
+       #define SERVER_COMMAND(name,function,description) \
+               { CMD_Write_Alias("qc_cmd_sv", name, description); }
+               
+       SERVER_COMMANDS(0, 0, "")
+       #undef SERVER_COMMAND
+       
+       return;
+}
        
 
 // =========================================
@@ -1957,31 +1732,57 @@ float GameCommand_macro_usage(float argc)
 void GameCommand(string command)
 {
        float argc = tokenize_console(command);
+       
+       // Guide for working with argc arguments by example:
+       // argc:   1    - 2      - 3     - 4
+       // argv:   0    - 1      - 2     - 3 
+       // cmd     vote - master - login - password
 
        if(strtolower(argv(0)) == "help") 
        {
                if(argc == 1) 
                {
-                       print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
+                       print("\nServer console commands:\n");
                        GameCommand_macro_help();
                        
+                       print("\nBanning commands:\n");
                        GameCommand_Ban("help");
-                       GameCommand_Generic("help");
-                       print("For help about specific commands, type sv_cmd help COMMAND\n");
+                       
+                       print("\nCommon networked commands:\n");
+                       CommonCommand_macro_help(world);
+                       
+                       print("\nGeneric commands shared by all programs:\n");
+                       GenericCommand_macro_help();
+                       
+                       print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n");
+                       print("For help about a specific command, type sv_cmd help COMMAND\n");
+                       
                        return;
                } 
-               else if(GameCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+               else if(CommonCommand_macro_usage(argc, world)) // Instead of trying to call a command, we're going to see detailed information about it
+               {
+                       return;
+               }
+               else if(GenericCommand_macro_usage(argc)) // same here, but for generic commands instead
+               {
+                       return;
+               }
+               else if(GameCommand_macro_usage(argc)) // finally try for normal commands too
                {
                        return;
                }
        } 
        else if(GameCommand_Ban(command)) 
        {
-               return; // handled by server/ipban.qc
+               return; // handled by server/command/ipban.qc
+       }
+       else if(CommonCommand_macro_command(argc, world, command))
+       {
+               return; // handled by server/command/common.qc
        }
-       else if(GameCommand_Generic(command)) 
+       else if(GenericCommand(command)) 
        {
-               return; // handled by common/gamecommand.qc
+               return; // handled by common/command/generic.qc
        }
        else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
        {
@@ -1989,7 +1790,7 @@ void GameCommand(string command)
        }
        
        // nothing above caught the command, must be invalid
-       print("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n");
+       print(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help.\n");
        
        return;
 }
\ No newline at end of file