]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/gamecommand.qc
Merge remote branch 'origin/master' into samual/updatecommands
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / gamecommand.qc
index 6283672860407be92e58d12576be344b878ef11c..74dc541a6751dd35cb4e531ffe7b54502736a12c 100644 (file)
@@ -1,11 +1,10 @@
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: November 6th, 2011
+//  Last updated: November 30th, 2011
 // =====================================================
 
-#define GC_REQUEST_HELP 1
-#define GC_REQUEST_COMMAND 2
-#define GC_REQUEST_USAGE 3
+#define GC_REQUEST_COMMAND 1
+#define GC_REQUEST_USAGE 2
 
 float RadarMap_Make(float argc);
 
@@ -13,6 +12,11 @@ string GotoMap(string m);
 
 void race_deleteTime(string map, float pos);
 
+#define SHUFFLETEAMS_MAX_PLAYERS 255
+#define SHUFFLETEAMS_MAX_TEAMS 4
+float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots
+float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams
+
 
 // ============================
 //  Misc. Supporting Functions
@@ -113,12 +117,6 @@ void GameCommand_adminmsg(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2adminmsg^7: Send an admin message to a client directly\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -179,12 +177,6 @@ void GameCommand_allready(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2allready^7: Restart the server and reset the players\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        ReadyRestart();
@@ -205,19 +197,13 @@ void GameCommand_allspec(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2allspec^7: Force all players to spectate\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
                        string reason = argv(1);
                        float i;
                        
-                       FOR_EACH_PLAYER(client)
+                       FOR_EACH_REALPLAYER(client)
                        {
                                self = client;
                                PutObserverInServer();
@@ -233,22 +219,16 @@ void GameCommand_allspec(float request, float argc)
                {
                        print("\nUsage:^3 sv_cmd allspec [reason]\n");
                        print("  Where 'reason' is an optional argument for explanation of allspec command.\n");
-                       print("See also: ^2moveplayer^7\n");
+                       print("See also: ^2moveplayer, shuffleteams^7\n");
                        return;
                }
        }
 }
 
-void GameCommand_anticheat(float request, float argc) // FIXME: player entity is never found
+void GameCommand_anticheat(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2anticheat^7: Create an anticheat report for a client\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -259,7 +239,7 @@ void GameCommand_anticheat(float request, float argc) // FIXME: player entity is
                                return;
                        }
                        client = edict_num(entno);
-                       if(clienttype(client) != CLIENTTYPE_REAL && clienttype(client) != CLIENTTYPE_BOT) {
+                       if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) {
                                print("Player ", client.netname, " is not active\n");
                                return;
                        }
@@ -283,12 +263,6 @@ void GameCommand_bbox(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2bbox^7: Print detailed information about world size\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z));
@@ -382,12 +356,6 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2bot_cmd^7: Control and send commands to bots\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity bot;
@@ -487,12 +455,6 @@ void GameCommand_cointoss(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2cointoss^7: Flip a virtual coin and give random result\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -520,12 +482,6 @@ void GameCommand_cvar_changes(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2cvar_changes^7: Prints a list of all changed server cvars\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        print(cvar_changes);
@@ -547,12 +503,6 @@ void GameCommand_cvar_purechanges(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2cvar_purechanges^7: Prints a list of all changed gameplay cvars\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        print(cvar_purechanges);
@@ -574,12 +524,6 @@ void GameCommand_database(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2database^7: Extra controls of the serverprogs database\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(argc == 3)
@@ -623,12 +567,6 @@ void GameCommand_defer_clear(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2defer_clear^7: Clear all queued defer commands for client\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -672,12 +610,6 @@ void GameCommand_defer_clear_all(float request)
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2defer_clear_all^7: Clear all queued defer commands for all clients\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -690,7 +622,7 @@ void GameCommand_defer_clear_all(float request)
                                GameCommand_defer_clear(GC_REQUEST_COMMAND, argc);      
                                ++i;
                        }
-                       if(i) { bprint(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? 
+                       if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? 
                        return;
                }
                
@@ -709,12 +641,6 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2delrec^7: Delete race time record for a map\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(argv(1))
@@ -744,12 +670,6 @@ void GameCommand_effectindexdump(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2effectindexdump^7: Dump list of effects from code and effectinfo.txt\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        float fh, d;
@@ -828,12 +748,6 @@ void GameCommand_extendmatchtime(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2extendmatchtime^7: Increase the timelimit value incrementally\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
@@ -855,12 +769,6 @@ void GameCommand_find(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2find^7: Search through entities for matching classname\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -886,12 +794,6 @@ void GameCommand_gametype(float request, float argc)
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2gametype^7: Simple command to change the active gametype\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        string s = argv(1);
@@ -931,12 +833,6 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2gettaginfo^7: Get specific information about a weapon model\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity tmp_entity;
@@ -998,12 +894,6 @@ void GameCommand_gotomap(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2gotomap^7: Simple command to switch to another map\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(argc == 2)
@@ -1029,12 +919,6 @@ void GameCommand_ladder(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2ladder^7: Get information about top players if supported\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        print(ladder_reply);
@@ -1055,12 +939,6 @@ void GameCommand_lockteams(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2lockteams^7: Disable the ability for players to switch or enter teams\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(teamplay)
@@ -1069,7 +947,9 @@ void GameCommand_lockteams(float request)
                                bprint("^1The teams are now locked.\n");
                        }
                        else
-                               bprint("That command can only be used in a team-based gamemode.\n");
+                       {
+                               bprint("lockteams command can only be used in a team-based gamemode.\n");
+                       }
                        return;
                }
                        
@@ -1088,12 +968,6 @@ void GameCommand_make_mapinfo(float request) // UNTESTED
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2make_mapinfo^7: Automatically rebuild mapinfo files\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                { 
                        entity tmp_entity;
@@ -1120,12 +994,6 @@ void GameCommand_modelbug(float request) // UNTESTED // is this even needed anym
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2modelbug^7: foobar\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        modelbug();
@@ -1146,12 +1014,6 @@ void GameCommand_moveplayer(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2moveplayer^7: Change the team/status of a player\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -1261,7 +1123,7 @@ void GameCommand_moveplayer(float request, float argc)
                                }
                                
                                if(successful)
-                                       print("Successfully moved players ", successful, " to destination ", destination, ".\n");
+                                       bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
                                else
                                        print("No players given (", original_targets, ") are able to move.\n");
                                        
@@ -1282,7 +1144,7 @@ void GameCommand_moveplayer(float request, float argc)
                        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("See also: ^2allspec^7\n");
+                       print("See also: ^2allspec, shuffleteams^7\n");
                        return;
                }
        }
@@ -1292,12 +1154,6 @@ void GameCommand_nospectators(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2nospectators^7: Automatically remove spectators from a match\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        blockSpectators = 1;
@@ -1328,12 +1184,6 @@ void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2onslaught_updatelinks^7: Refresh link status for onslaught\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        onslaught_updatelinks();
@@ -1351,73 +1201,74 @@ void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this
        }
 }
 
-void GameCommand_playerdemo(float request, float argc) // UNTESTED // TODO: change the if statements for sub arguments to switches
+void GameCommand_playerdemo(float request, float argc) // UNTESTED
 {      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2playerdemo^7: Control the ability to save demos of players\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
                        float i, n, entno;
                        string s;
                        
-                       if(argv(1) == "read")
+                       switch(argv(1))
                        {
-                               // TODO: Create a general command for looking this up, save a lot of space everywhere in this file
-                               entno = stof(argv(2));
-                               if((entno < 1) | (entno > maxclients)) {
-                                       print("Player ", argv(2), " doesn't exist\n");
+                               case "read":
+                               {
+                                       // 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");
+                                               return;
+                                       }
+                                       client = edict_num(entno);
+                                       if(clienttype(client) != CLIENTTYPE_BOT) {
+                                               print("Player ", client.netname, " is not a bot\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":
+                               {
+                                       entno = GetFilteredNumber(argv(2));
+                                       if((entno < 1) | (entno > maxclients)) {
+                                               print("Player ", argv(2), " doesn't exist\n");
+                                               return;
+                                       }
+                                       client = edict_num(entno);
+                                       self = client;
+                                       playerdemo_open_write(argv(3));
                                        return;
                                }
-                               self = client;
-                               playerdemo_open_read(argv(3));
-                               return;
-                       }
-                       else if(argv(1) == "write")
-                       {
-                               entno = stof(argv(2));
-                               if((entno < 1) | (entno > maxclients)) {
-                                       print("Player ", argv(2), " doesn't exist\n");
+                               
+                               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;
                                }
-                               client = edict_num(entno);
-                               self = client;
-                               playerdemo_open_write(argv(3));
-                               return;
-                       }
-                       else if(argv(1) == "auto_read_and_write")
-                       {
-                               s = argv(2);
-                               n = stof(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;
-                       }
-                       else if(argv(1) == "auto_read")
-                       {
-                               s = argv(2);
-                               n = stof(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");
+                               
+                               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;
                        }
-                       return;
                }
                        
                default:
@@ -1435,12 +1286,6 @@ void GameCommand_printstats(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2printstats^7: foobar\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        DumpStats(FALSE);
@@ -1462,12 +1307,6 @@ void GameCommand_radarmap(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2radarmap^7: Generate a radar image of the map\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(RadarMap_Make(argc))
@@ -1490,12 +1329,6 @@ void GameCommand_rankings(float request) // this is OLD.... jeez.
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2rankings^7: Print information about rankings\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        strunzone(rankings_reply);
@@ -1518,12 +1351,6 @@ void GameCommand_records(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2records^7: List top 10 records for the current map\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        float i;
@@ -1548,12 +1375,6 @@ void GameCommand_reducematchtime(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2reducematchtime^7: Decrease the timelimit value incrementally\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
@@ -1575,24 +1396,19 @@ void GameCommand_setbots(float request, float argc)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2setbots^7: Change the values of bot_number and minplayers immediately to change the bot count\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
-                       if(argc >= 3 && argv(1) == "setbots")
+                       if(argc >= 2)
                        {
                                cvar_settemp("minplayers", "0");
-                               cvar_settemp("bot_number", argv(2));
+                               cvar_settemp("bot_number", argv(1));
                                bot_fixcount();
                                return;
                        }
                }
                        
                default:
+                       print("Incorrect parameters for ^2setbots^7\n");
                case GC_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd setbots botnumber\n");
@@ -1603,6 +1419,109 @@ void GameCommand_setbots(float request, float argc)
        }
 }
 
+void GameCommand_shuffleteams(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(teamplay)
+                       {
+                               entity tmp_player;
+                               float i, x, z, t_teams, t_players, team_color;
+
+                               // count the total amount of players and total amount of teams
+                               FOR_EACH_PLAYER(tmp_player)
+                               {
+                                       CheckAllowedTeams(tmp_player);
+                                       
+                                       if(c1 >= 0) t_teams = max(1, t_teams);
+                                       if(c2 >= 0) t_teams = max(2, t_teams);
+                                       if(c3 >= 0) t_teams = max(3, t_teams);
+                                       if(c4 >= 0) t_teams = max(4, t_teams);
+                                       
+                                       ++t_players;
+                               }
+                               
+                               // build a list of the players in a random order
+                               FOR_EACH_PLAYER(tmp_player)
+                               {
+                                       for(;;)
+                                       {
+                                               i = bound(1, floor(random() * maxclients) + 1, maxclients);
+                                               
+                                               if(shuffleteams_players[i])
+                                               {
+                                                       continue; // a player is already assigned to this slot
+                                               }
+                                               else
+                                               {
+                                                       shuffleteams_players[i] = num_for_edict(tmp_player);
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               // finally, from the list made earlier, re-join the players in different order. 
+                               for(i = 1; i <= t_teams; ++i)
+                               {
+                                       // find out how many players to assign to this team
+                                       x = (t_players / t_teams);
+                                       x = ((i == 1) ? ceil(x) : floor(x));
+                                       
+                                       team_color = NumberToTeamNumber(i);
+                                       
+                                       // sort through the random list of players made earlier 
+                                       for(z = 1; z <= maxclients; ++z)
+                                       {                                                       
+                                               if not(shuffleteams_teams[i] >= x)
+                                               {
+                                                       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(self.team != team_color) 
+                                                               MoveToTeam(self, team_color, 6, 0);
+
+                                                       shuffleteams_players[z] = 0;
+                                                       shuffleteams_teams[i] = shuffleteams_teams[i] + 1;
+                                               }
+                                               else
+                                               {
+                                                       break; // move on to next team
+                                               }
+                                       }
+                               }
+                               
+                               bprint("Successfully shuffled the players around randomly.\n");
+                               
+                               // clear the buffers now
+                               for (i=0; i<SHUFFLETEAMS_MAX_PLAYERS; ++i)
+                                       shuffleteams_players[i] = 0;
+                               
+                               for (i=0; i<SHUFFLETEAMS_MAX_TEAMS; ++i)
+                                       shuffleteams_teams[i] = 0;
+                       }
+                       else
+                       {
+                               print("Can't shuffle teams when currently not playing a team game.\n");
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd shuffleteams\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2moveplayer, allspec^7\n");
+                       return;
+               }
+       }
+}
+
 void GameCommand_stuffto(float request, float argc)
 {
        // This... is a fairly dangerous and powerful command... - It allows any arguments to be sent to a client via rcon.
@@ -1612,12 +1531,6 @@ void GameCommand_stuffto(float request, float argc)
        #ifdef STUFFTO_ENABLED
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2stuffto^7: Send a command to be executed on a client\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        entity client;
@@ -1625,7 +1538,7 @@ void GameCommand_stuffto(float request, float argc)
                        
                        if(argc == 3)
                        {
-                               entno = stof(argv(1));
+                               entno = GetFilteredNumber(argv(1));
                                client = world;
                                if(entno <= maxclients)
                                        client = edict_num(entno);
@@ -1650,10 +1563,10 @@ void GameCommand_stuffto(float request, float argc)
                        return;
                }
        }
-       #else // give the response for missing command to fake them out ;3
-       if(request == GC_REQUEST_COMMAND)
+       #else
+       if(request)
        {
-               print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+               print("stuffto command is not enabled on this server.\n");
                return;
        }
        #endif
@@ -1663,12 +1576,6 @@ void GameCommand_teamstatus(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2teamstatus^7: Show information about player and team scores\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        Score_NicePrint(world);
@@ -1689,12 +1596,6 @@ void GameCommand_time(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2time^7: Print different formats/readouts of time\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        print("time = ", ftos(time), "\n");
@@ -1721,12 +1622,6 @@ void GameCommand_trace(float request, float argc)
 {                                              
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2trace^7: Various debugging tools with tracing\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        // TODO: Clean up all of these variables and merge the code below to use only a few
@@ -1737,6 +1632,7 @@ void GameCommand_trace(float request, float argc)
                        switch(argv(1))
                        {
                                case "debug":
+                               {
                                        print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
                                        for(;;)
                                        {
@@ -1825,8 +1721,10 @@ void GameCommand_trace(float request, float argc)
                                                }
                                        }
                                        return;
+                               }
                                        
                                case "debug2":
+                               {
                                        e = nextent(world);
                                        tracebox(e.origin + '0 0 32', e.mins, e.maxs, e.origin + '0 0 -1024', MOVE_NORMAL, e);
                                        vv = trace_endpos;
@@ -1854,8 +1752,10 @@ void GameCommand_trace(float request, float argc)
                                        }
                                        print("highest possible dist: ", ftos(f), "\n");
                                        return;
+                               }
                                
                                case "walk":
+                               {
                                        if(argc == 3)
                                        {
                                                e = nextent(world);
@@ -1865,8 +1765,10 @@ void GameCommand_trace(float request, float argc)
                                                        print("cannot walk\n");
                                                return;
                                        }
-                                               
+                               }
+                               
                                case "showline":
+                               {
                                        if(argc == 3)
                                        {
                                                vv = stov(argv(1));
@@ -1876,11 +1778,14 @@ void GameCommand_trace(float request, float argc)
                                                trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv);
                                                return;
                                        }
-                               // no default case, just go straight to "invalid arguments"
+                               }
+                               
+                               // no default case, just go straight to invalid
                        }
                }
                        
                default:
+                       print("Incorrect parameters for ^2trace^7\n");
                case GC_REQUEST_USAGE:
                {
                        print("\nUsage:^3 sv_cmd trace command [arguments]\n");
@@ -1894,12 +1799,6 @@ void GameCommand_unlockteams(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2unlockteams^7: Enable the ability for players to switch or enter teams\n");
-                       return;
-               }
-                       
                case GC_REQUEST_COMMAND:
                {
                        if(teamplay)
@@ -1908,7 +1807,9 @@ void GameCommand_unlockteams(float request)
                                bprint("^1The teams are now unlocked.\n");
                        }
                        else
-                               bprint("That command can only be used in a team-based gamemode.\n");
+                       {
+                               bprint("unlockteams command can only be used in a team-based gamemode.\n");
+                       }
                        return;
                }
                        
@@ -1927,17 +1828,10 @@ void GameCommand_warp(float request, float argc)
 {
        switch (request)
        {
-               case GC_REQUEST_HELP:
-               {
-                       print("  ^2warp^7: Choose different level in campaign\n");
-                       return;
-               }
-               
                case GC_REQUEST_COMMAND:
                {
                        if(autocvar_g_campaign)
                        {
-                               
                                if(argc >= 2)
                                {
                                        CampaignLevelWarp(stof(argv(1)));
@@ -1964,32 +1858,84 @@ void GameCommand_warp(float request, float argc)
        }
 }
 
+/* use this when creating a new command, making sure to place it in alphabetical order.
+void GameCommand_(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd \n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
 
-// ===========================
-//  Macro system for commands
-// ===========================
+// ==================================
+//  Macro system for server commands
+// ==================================
 
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
 #define SERVER_COMMANDS(request,arguments) \
-       SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments)) \
-       SERVER_COMMAND("allready", GameCommand_allready(request)) \
-       SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments)) \
-       SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments)) \
-       SERVER_COMMAND("bbox", GameCommand_bbox(request)) \
-       SERVER_COMMAND("bot_cmd", GameCommand_bot_cmd(request, arguments)) \
-       SERVER_COMMAND("cointoss", GameCommand_cointoss(request, arguments)) \
-       SERVER_COMMAND("cvar_changes", GameCommand_cvar_changes(request)) \
-       SERVER_COMMAND("cvar_purechanges", GameCommand_cvar_purechanges(request)) \
-       SERVER_COMMAND("database", GameCommand_database(request, arguments)) \
-       SERVER_COMMAND("defer_clear", GameCommand_defer_clear(request, arguments)) \
-       SERVER_COMMAND("defer_clear_all", GameCommand_defer_clear_all(request)) \
-       SERVER_COMMAND("delrec", GameCommand_delrec(request, arguments)) \
-       SERVER_COMMAND("effectindexdump", GameCommand_effectindexdump(request)) \
+       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") \
+       SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \
+       SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \
+       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") \
+       SERVER_COMMAND("delrec", GameCommand_delrec(request, arguments), "Delete race time record for a map") \
+       SERVER_COMMAND("effectindexdump", GameCommand_effectindexdump(request), "Dump list of effects from code and effectinfo.txt") \
+       SERVER_COMMAND("extendmatchtime", GameCommand_extendmatchtime(request), "Increase the timelimit value incrementally") \
+       SERVER_COMMAND("find", GameCommand_find(request, arguments), "Search through entities for matching classname") \
+       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("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(world, arguments), "Server side control of voting") \
        /* nothing */
-       
+
 void GameCommand_macro_help()
 {
-       #define SERVER_COMMAND(name,function) function;
-       SERVER_COMMANDS(GC_REQUEST_HELP, 0)
+       #define SERVER_COMMAND(name,function,description) \
+               { print("  ^2", name, "^7: ", description, "\n"); }
+               
+       SERVER_COMMANDS(0, 0)
        #undef SERVER_COMMAND
        
        return;
@@ -1997,7 +1943,9 @@ void GameCommand_macro_help()
 
 float GameCommand_macro_command(float argc)
 {
-       #define SERVER_COMMAND(name,function) if(name == strtolower(argv(0))) { function; return TRUE; } 
+       #define SERVER_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               
        SERVER_COMMANDS(GC_REQUEST_COMMAND, argc)
        #undef SERVER_COMMAND
        
@@ -2006,7 +1954,9 @@ float GameCommand_macro_command(float argc)
 
 float GameCommand_macro_usage(float argc)
 {
-       #define SERVER_COMMAND(name,function) if(name == strtolower(argv(1))) { function; return TRUE; }
+       #define SERVER_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               
        SERVER_COMMANDS(GC_REQUEST_USAGE, argc)
        #undef SERVER_COMMAND
        
@@ -2029,7 +1979,7 @@ void GameCommand(string command)
                {
                        print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
                        GameCommand_macro_help();
-                       GameCommand_Vote("help", world);
+                       
                        GameCommand_Ban("help");
                        GameCommand_Generic("help");
                        print("For help about specific commands, type sv_cmd help COMMAND\n");
@@ -2040,10 +1990,6 @@ void GameCommand(string command)
                        return;
                }
        } 
-       else if(GameCommand_Vote(command, world)) 
-       {
-               return; // handled by server/vote.qc 
-       }
        else if(GameCommand_Ban(command)) 
        {
                return; // handled by server/ipban.qc
@@ -2058,5 +2004,7 @@ void GameCommand(string command)
        }
        
        // nothing above caught the command, must be invalid
-       //print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+       print("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n");
+       
+       return;
 }
\ No newline at end of file