]> 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 70371f42b782a48634a552a4c0d287b26ac9531b..7d24f2e5ab1614fdaa482dbbb04927704b825346 100644 (file)
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: July 22nd, 2011
+//  Last updated: December 6th, 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
 
-entity radarmapper;
-
-float RADAR_WIDTH_MAX = 512;
-float RADAR_HEIGHT_MAX = 512;
-float sharpen_buffer[RADAR_WIDTH_MAX * 3];
+float RadarMap_Make(float argc);
 
 string GotoMap(string m);
-string doublehex = "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFFFF";
-// FF is contained twice, to map 256 to FF too
-// removes the need to bound()
 
 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
 // ============================
 
-// used by GameCommand_radarmap()
-float FullTraceFraction(vector a, vector mi, vector ma, vector b)
-{
-       vector c;
-       float white, black;
-
-       white = 0.001;
-       black = 0.001;
-
-       c = a;
-
-       float n, m;
-       n = m = 0;
-
-       while(vlen(c - b) > 1)
-       {
-               ++m;
-
-               tracebox(c, mi, ma, b, MOVE_WORLDONLY, world);
-               ++n;
-
-               if(!trace_startsolid)
-               {
-                       black += vlen(trace_endpos - c);
-                       c = trace_endpos;
-               }
-
-               n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world);
-
-               white += vlen(trace_endpos - c);
-               c = trace_endpos;
-       }
-
-       if(n > 200)
-               dprint("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n");
-
-       return white / (black + white);
-}
-float RadarMapAtPoint_Trace(float x, float y, float w, float h, float zmin, float zsize, float q)
-{
-       vector a, b, mi, ma;
-
-       mi = '0 0 0';
-       ma = '1 0 0' * w + '0 1 0' * h;
-       a = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin;
-       b = '1 0 0' * x + '0 1 0' * y + '0 0 1' * (zsize + zmin);
-
-       return FullTraceFraction(a, mi, ma, b);
-}
-float RadarMapAtPoint_LineBlock(float x, float y, float w, float h, float zmin, float zsize, float q)
-{
-       vector o, mi, ma;
-       float i, r;
-       vector dz;
-
-       q = 256 * q - 1;
-       // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value
-
-       mi = '0 0 0';
-       dz = (zsize / q) * '0 0 1';
-       ma = '1 0 0' * w + '0 1 0' * h + dz;
-       o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin;
-
-       if(x < world.absmin_x - w)
-               return 0;
-       if(y < world.absmin_y - h)
-               return 0;
-       if(x > world.absmax_x)
-               return 0;
-       if(y > world.absmax_y)
-               return 0;
-
-       r = 0;
-       for(i = 0; i < q; ++i)
-       {
-               vector v1, v2;
-               v1 = v2 = o + dz * i + mi;
-               v1_x += random() * (ma_x - mi_x);
-               v1_y += random() * (ma_y - mi_y);
-               v1_z += random() * (ma_z - mi_z);
-               v2_x += random() * (ma_x - mi_x);
-               v2_y += random() * (ma_y - mi_y);
-               v2_z += random() * (ma_z - mi_z);
-               traceline(v1, v2, MOVE_WORLDONLY, world);
-               if(trace_startsolid || trace_fraction < 1)
-                       ++r;
-       }
-       return r / q;
-}
-float RadarMapAtPoint_Block(float x, float y, float w, float h, float zmin, float zsize, float q)
-{
-       vector o, mi, ma;
-       float i, r;
-       vector dz;
-
-       q = 256 * q - 1;
-       // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value
-
-       mi = '0 0 0';
-       dz = (zsize / q) * '0 0 1';
-       ma = '1 0 0' * w + '0 1 0' * h + dz;
-       o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin;
-
-       if(x < world.absmin_x - w)
-               return 0;
-       if(y < world.absmin_y - h)
-               return 0;
-       if(x > world.absmax_x)
-               return 0;
-       if(y > world.absmax_y)
-               return 0;
-
-       r = 0;
-       for(i = 0; i < q; ++i)
-       {
-               tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, world);
-               if(trace_startsolid)
-                       ++r;
-       }
-       return r / q;
-}
-float RadarMapAtPoint_Sample(float x, float y, float w, float h, float zmin, float zsize, float q)
-{
-       vector a, b, mi, ma;
-
-       q *= 4; // choose q so it matches the regular algorithm in speed
-
-       q = 256 * q - 1;
-       // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value
-
-       mi = '0 0 0';
-       ma = '1 0 0' * w + '0 1 0' * h;
-       a = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin;
-       b = '1 0 0' * w + '0 1 0' * h + '0 0 1' * zsize;
-
-       float c, i;
-       c = 0;
-
-       for(i = 0; i < q; ++i)
-       {
-               vector v;
-               v_x = a_x + random() * b_x;
-               v_y = a_y + random() * b_y;
-               v_z = a_z + random() * b_z;
-               traceline(v, v, MOVE_WORLDONLY, world);
-               if(trace_startsolid)
-                       ++c;
-       }
-
-       return c / q;
-}
-void sharpen_set(float x, float v)
-{
-       sharpen_buffer[x + 2 * RADAR_WIDTH_MAX] = v;
-}
-float sharpen_getpixel(float x, float y)
-{
-       if(x < 0)
-               return 0;
-       if(x >= RADAR_WIDTH_MAX)
-               return 0;
-       if(y < 0)
-               return 0;
-       if(y > 2)
-               return 0;
-       return sharpen_buffer[x + y * RADAR_WIDTH_MAX];
-}
-float sharpen_get(float x, float a)
-{
-       float sum;
-       sum = sharpen_getpixel(x, 1);
-       if(a == 0)
-               return sum;
-       sum *= (8 + 1/a);
-       sum -= sharpen_getpixel(x - 1, 0);
-       sum -= sharpen_getpixel(x - 1, 1);
-       sum -= sharpen_getpixel(x - 1, 2);
-       sum -= sharpen_getpixel(x + 1, 0);
-       sum -= sharpen_getpixel(x + 1, 1);
-       sum -= sharpen_getpixel(x + 1, 2);
-       sum -= sharpen_getpixel(x, 0);
-       sum -= sharpen_getpixel(x, 2);
-       return bound(0, sum * a, 1);
-}
-void sharpen_shift(float w)
-{
-       float i;
-       for(i = 0; i < w; ++i)
-       {
-               sharpen_buffer[i] = sharpen_buffer[i + RADAR_WIDTH_MAX];
-               sharpen_buffer[i + RADAR_WIDTH_MAX] = sharpen_buffer[i + 2 * RADAR_WIDTH_MAX];
-               sharpen_buffer[i + 2 * RADAR_WIDTH_MAX] = 0;
-       }
-}
-void sharpen_init(float w)
-{
-       float i;
-       for(i = 0; i < w; ++i)
-       {
-               sharpen_buffer[i] = 0;
-               sharpen_buffer[i + RADAR_WIDTH_MAX] = 0;
-               sharpen_buffer[i + 2 * RADAR_WIDTH_MAX] = 0;
-       }
-}
-void RadarMap_Next()
-{
-       if(radarmapper.count & 4)
-       {
-               localcmd("quit\n");
-       }
-       else if(radarmapper.count & 2)
-       {
-               localcmd(strcat("defer 1 \"sv_cmd radarmap --flags ", ftos(radarmapper.count), strcat(" --res ", ftos(radarmapper.size_x), " ", ftos(radarmapper.size_y), " --sharpen ", ftos(radarmapper.ltime), " --qual ", ftos(radarmapper.size_z)), "\"\n"));
-               GotoNextMap();
-       }
-       remove(radarmapper);
-       radarmapper = world;
-}
-void RadarMap_Think()
-{
-       // rough map entity
-       //   cnt: current line
-       //   size: pixel width/height
-       //   maxs: cell width/height
-       //   frame: counter
-       
-       float i, x, l;
-       string si;
-
-       if(self.frame == 0)
-       {
-               // initialize
-               get_mi_min_max_texcoords(1);
-               self.mins = mi_picmin;
-               self.maxs_x = (mi_picmax_x - mi_picmin_x) / self.size_x;
-               self.maxs_y = (mi_picmax_y - mi_picmin_y) / self.size_y;
-               self.maxs_z = mi_max_z - mi_min_z;
-               print("Picture mins/maxs: ", ftos(self.maxs_x), " and ", ftos(self.maxs_y), " should match\n");
-               self.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm"));
-               if(!(self.count & 1))
-               {
-                       self.cnt = fopen(self.netname, FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.tga"), FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.png"), FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.jpg"), FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.tga"), FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.png"), FILE_READ);
-                       if(self.cnt < 0)
-                               self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.jpg"), FILE_READ);
-                       if(self.cnt >= 0)
-                       {
-                               fclose(self.cnt);
-
-                               print(self.netname, " already exists, aborting (you may want to specify --force)\n");
-                               RadarMap_Next();
-                               return;
-                       }
-               }
-               self.cnt = fopen(self.netname, FILE_WRITE);
-               if(self.cnt < 0)
-               {
-                       print("Error writing ", self.netname, "\n");
-                       remove(self);
-                       radarmapper = world;
-                       return;
-               }
-               print("Writing to ", self.netname, "...\n");
-               fputs(self.cnt, "/* XPM */\n");
-               fputs(self.cnt, "static char *RadarMap[] = {\n");
-               fputs(self.cnt, "/* columns rows colors chars-per-pixel */\n");
-               fputs(self.cnt, strcat("\"", ftos(self.size_x), " ", ftos(self.size_y), " 256 2\",\n"));
-               for(i = 0; i < 256; ++i)
-               {
-                       si = substring(doublehex, i*2, 2);
-                       fputs(self.cnt, strcat("\"", si, " c #", si, si, si, "\",\n"));
-               }
-               self.frame += 1;
-               self.nextthink = time;
-               sharpen_init(self.size_x);
-       }
-       else if(self.frame <= self.size_y)
-       {
-               // fill the sharpen buffer with this line
-               sharpen_shift(self.size_x);
-               i = self.count & 24;
-
-               switch(i)
-               {
-                       case 0:
-                       default:
-                               for(x = 0; x < self.size_x; ++x)
-                               {
-                                       l = RadarMapAtPoint_Block(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z);
-                                       sharpen_set(x, l);
-                               }
-                               break;
-                       case 8:
-                               for(x = 0; x < self.size_x; ++x)
-                               {
-                                       l = RadarMapAtPoint_Trace(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z);
-                                       sharpen_set(x, l);
-                               }
-                               break;
-                       case 16:
-                               for(x = 0; x < self.size_x; ++x)
-                               {
-                                       l = RadarMapAtPoint_Sample(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z);
-                                       sharpen_set(x, l);
-                               }
-                               break;
-                       case 24:
-                               for(x = 0; x < self.size_x; ++x)
-                               {
-                                       l = RadarMapAtPoint_LineBlock(self.mins_x + x * self.maxs_x, self.mins_y + (self.size_y - self.frame) * self.maxs_y, self.maxs_x, self.maxs_y, self.mins_z, self.maxs_z, self.size_z);
-                                       sharpen_set(x, l);
-                               }
-                               break;
-               }
-
-               // do we have enough lines?
-               if(self.frame >= 2)
-               {
-                       // write a pixel line
-                       fputs(self.cnt, "\"");
-                       for(x = 0; x < self.size_x; ++x)
-                       {
-                               l = sharpen_get(x, self.ltime);
-                               fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2));
-                       }
-                       if(self.frame == self.size_y)
-                               fputs(self.cnt, "\"\n");
-                       else
-                       {
-                               fputs(self.cnt, "\",\n");
-                               print(ftos(self.size_y - self.frame), " lines left\n");
-                       }
-               }
-
-               // is this the last line? then write back the missing line
-               if(self.frame == self.size_y)
-               {
-                       sharpen_shift(self.size_x);
-                       // write a pixel line
-                       fputs(self.cnt, "\"");
-                       for(x = 0; x < self.size_x; ++x)
-                       {
-                               l = sharpen_get(x, self.ltime);
-                               fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2));
-                       }
-                       if(self.frame == self.size_y)
-                               fputs(self.cnt, "\"\n");
-                       else
-                       {
-                               fputs(self.cnt, "\",\n");
-                               print(ftos(self.size_y - self.frame), " lines left\n");
-                       }
-               }
-
-               self.frame += 1;
-               self.nextthink = time;
-       }
-       else
-       {
-               // close the file
-               fputs(self.cnt, "};\n");
-               fclose(self.cnt);
-               print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n");
-               RadarMap_Next();
-       }
-}
-
 //  used by GameCommand_make_mapinfo()
 void make_mapinfo_Think()
 {
@@ -492,20 +113,17 @@ void modelbug()
 //  Command Sub-Functions
 // =======================
 
-void GameCommand_adminmsg(float request, float argc)
+void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer
 {
-       entity client;
-       float entno = stof(argv(1)); 
-       float n, i;
-       string s;
-       
        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;
+                       float entno = stof(argv(1)); 
+                       float n, i;
+                       string s;
+                       
                        if(argc >= 3 && argc <= 4) {
                                if((entno < 0) | (entno > maxclients)) {
                                        print("Player ", argv(1), " doesn't exist\n");
@@ -538,17 +156,20 @@ void GameCommand_adminmsg(float request, float argc)
                                }
                                if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } 
                                return;
-                       } 
-                       
+                       }
+               }
+               
                default:
                        print("Incorrect parameters for ^2adminmsg^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd adminmsg clientnumber \"message\" [infobartime]\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");
                        return;
+               }
        }
 }
 
@@ -556,84 +177,85 @@ 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();
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd allready\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
 void GameCommand_allspec(float request, float argc)
-{
-       entity client;
-       float i;
-       
+{      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2allspec^7: Force all players to spectate\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
-                       FOR_EACH_PLAYER(client)
+               {
+                       entity client;
+                       string reason = argv(1);
+                       float i;
+                       
+                       FOR_EACH_REALPLAYER(client)
                        {
                                self = client;
                                PutObserverInServer();
                                ++i;
                        }
-                       if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (argv(1) ? strcat(" for reason: '", argv(1), "'") : ""), ".\n")); }
+                       if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); }
                        else { print("No players found to spectate.\n"); }
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        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)
 {
-       entity client;
-       float entno = stof(argv(1)); 
-       
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2anticheat^7: Create an anticheat report for a client\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float entno = stof(argv(1)); 
+                       
                        if((entno < 1) | (entno > maxclients)) {
                                print("Player ", argv(1), " doesn't exist\n");
                                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;
                        }
                        self = client;
                        anticheat_report();
                        return;
+               }
                        
                default:
                        print("Incorrect parameters for ^2anticheat^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd anticheat clientnumber\n");
                        print("  where 'clientnumber' is player entity number.\n");
                        return;
+               }
        }
 }
 
@@ -641,11 +263,8 @@ 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));
                        print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n");
                        print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z));
@@ -720,27 +339,27 @@ void GameCommand_bbox(float request)
                                
                        print("\n");
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd bbox\n");
                        print("  No arguments required.\n");
                        print("See also: ^2gettaginfo^7\n");
                        return;
+               }
        }
 }
 
 void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
 {
-       entity bot;
-       
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2bot_cmd^7: Control and send commands to bots\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
+               {
+                       entity bot;
+                       
                        if(argv(1) == "reset")
                        {
                                bot_resetqueues();
@@ -764,12 +383,26 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
 
                                        if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
                                        {
-                                               // let's start at token 2 so we can skip sv_cmd bot_cmd
-                                               bot = find_bot_by_number(stof(argv(2)));
-                                               if(bot == world)
-                                                       bot = find_bot_by_name(argv(2));
-                                               if(bot)
-                                                       bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
+                                               if(argv(2) == "reset")
+                                               {
+                                                       bot_resetqueues();
+                                               }
+                                               else if(argv(2) == "setbots")
+                                               {
+                                                       cvar_settemp("minplayers", "0");
+                                                       cvar_settemp("bot_number", argv(3));
+                                                       if(!bot_fixcount())
+                                                               print("Sorry, could not set requested bot count\n");
+                                               }
+                                               else
+                                               {
+                                                       // let's start at token 2 so we can skip sv_cmd bot_cmd
+                                                       bot = find_bot_by_number(stof(argv(2)));
+                                                       if(bot == world)
+                                                               bot = find_bot_by_name(argv(2));
+                                                       if(bot)
+                                                               bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
+                                               }
                                        }
                                        else
                                                localcmd(strcat(s, "\n"));
@@ -795,50 +428,53 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
                                        bot = find_bot_by_name(argv(1));
                                if(bot)
                                {
-                                       print(strcat("Command '", (argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
+                                       print(strcat("Command '", strcat(argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
                                        bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
                                        return;
                                }
                                else
                                        print(strcat("Error: Can't find bot with the name or id '", argv(1),"' - Did you mistype the command?\n")); // don't return so that usage is shown
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2bot_cmd^7\n");
                case GC_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");
                        return;
+               }
        }
 }
 
 void GameCommand_cointoss(float request, float argc)
 {
-       entity client;
-       string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n");
-       string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n");
-       string choice = ((random() > 0.5) ? result1 : result2);
-       
        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;
+                       string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n");
+                       string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n");
+                       string choice = ((random() > 0.5) ? result1 : result2);
+                       
                        FOR_EACH_CLIENT(client)
                                centerprint(client, strcat("^3Throwing coin... Result: ", choice));
                        bprint(strcat("^3Throwing coin... Result: ", choice));
                        return;
-                       
+               }
+               
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n");
                        print("  Where 'result1' and 'result2' are user created options.\n");
                        return;
+               }
        }
 }
 
@@ -846,20 +482,20 @@ 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);
                        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;
+               }
        }
 }
 
@@ -867,20 +503,20 @@ 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);
                        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;
+               }
        }
 }
 
@@ -888,11 +524,8 @@ 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)
                        {
                                if(argv(1) == "save")
@@ -915,30 +548,30 @@ void GameCommand_database(float request, float argc)
                                        return;
                                }
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2database^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd database action filename\n");
                        print("  Where 'action' is the command to complete,\n");
                        print("  and 'filename' is what it acts upon.\n");
                        print("  Full list of commands here: \"save, dump, load.\"\n");
                        return;
+               }
        }
 }
 
 void GameCommand_defer_clear(float request, float argc)
-{
-       entity client;
-       float entno = stof(argv(1));
-       
+{      
        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;
+                       float entno = stof(argv(1));
+                       
                        if(argc == 2)
                        {
                                // player_id is out of range
@@ -959,45 +592,48 @@ void GameCommand_defer_clear(float request, float argc)
                                print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
                                return;
                        }
+               }
                
                default:
                        print("Incorrect parameters for ^2defer_clear^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd defer_clear clientnumber\n");
                        print("  where 'clientnumber' is player entity number.\n");
                        print("See also: ^2defer_clear_all^7\n");
                        return;
+               }
        }
 }
 
 void GameCommand_defer_clear_all(float request)
-{
-       entity client;
-       float i;
-       float argc;
-       
+{      
        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;
+                       float i;
+                       float argc;
+                       
                        FOR_EACH_CLIENT(client)
                        {
                                argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client))));
                                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;
+               }
                
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd defer_clear_all\n");
                        print("  No arguments required.\n");
                        print("See also: ^2defer_clear^7\n");
                        return;
+               }
        }
 }
 
@@ -1005,11 +641,8 @@ 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))
                        {
                                if(argv(2))
@@ -1018,30 +651,30 @@ void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge
                                        race_deleteTime(GetMapname(), stof(argv(1)));
                                return;
                        }
-                       
+               }       
+               
                default:
                        print("Incorrect parameters for ^2delrec^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd delrec ranking [map]\n");
                        print("  'ranking' is which ranking level to clear up to, \n");
                        print("  it will clear all records up to nth place.\n");
                        print("  if 'map' is not provided it will use current map.\n");
                        return;
+               }
        }
 }
 
 void GameCommand_effectindexdump(float request)
 {
-       float fh, d;
-       string s;
-       
        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;
+                       string s;
+                       
                        d = db_create();
                        print("begin of effects list\n");
                        db_put(d, "TE_GUNSHOT", "1"); print("effect TE_GUNSHOT is ", ftos(particleeffectnum("TE_GUNSHOT")), "\n");
@@ -1084,7 +717,7 @@ void GameCommand_effectindexdump(float request)
                        fh = fopen("effectinfo.txt", FILE_READ);
                        while((s = fgets(fh)))
                        {
-                               tokenize(s); // tokenize_console would hit the loop counter :(
+                               tokenize_console(s);
                                if(argv(0) == "effect")
                                {
                                        if(db_get(d, argv(1)) != "1")
@@ -1099,12 +732,15 @@ void GameCommand_effectindexdump(float request)
 
                        db_close(d);
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd effectindexdump\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
@@ -1112,59 +748,57 @@ 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);
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd extendmatchtime\n");
                        print("  No arguments required.\n");
                        print("See also: ^2reducematchtime^7\n");
                        return;
+               }
        }
 }
 
 void GameCommand_find(float request, float argc)
-{
-       entity client;
-       
+{      
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2find^7: Search through entities for matching classname\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       
                        for(client = world; (client = find(client, classname, argv(1))); )
                                print(etos(client), "\n");
+                               
                        return;
+               }
                        
                default:
                        print("Incorrect parameters for ^2find^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd find classname\n");
                        print("  Where 'classname' is the classname to search for.\n");
                        return;
+               }
        }
 }
 
 void GameCommand_gametype(float request, float argc)
-{
-       string s = argv(1);
-       float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
-       
+{      
        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);
+                       float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
+                       
                        if(t)
                        {
                                MapInfo_SwitchGameType(t);
@@ -1181,30 +815,30 @@ void GameCommand_gametype(float request, float argc)
                        else
                                bprint("Game type switch to ", s, " failed: this type does not exist!\n");
                        return;
+               }
                        
                default:
                        print("Incorrect parameters for ^2gametype^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd gametype mode\n");
                        print("  Where 'mode' is the gametype mode to switch to.\n");
                        print("See also: ^2gotomap^7\n");
                        return;
+               }
        }
 }
 
 void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit)
-{
-       entity tmp_entity;
-       float i;
-       vector v;
-       
+{      
        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;
+                       float i;
+                       vector v;
+                       
                        if(argc >= 4)
                        {
                                tmp_entity = spawn();
@@ -1242,14 +876,17 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini
                                remove(tmp_entity);
                                return;
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2gettaginfo^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd gettaginfo\n");
                        print("  FIXME: Arguments currently unknown\n");
                        print("See also: ^2bbox^7\n");
                        return;
+               }
        }
 }
 
@@ -1257,24 +894,24 @@ 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)
                        {
                                print(GotoMap(argv(1)), "\n");
                                return;
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2gotomap^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd gotomap map\n");
                        print("  Where 'map' is the *.bsp file to change to.\n");
                        print("See also: ^2gametype^7\n");
                        return;
+               }
        }
 }
 
@@ -1282,19 +919,19 @@ 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);
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd ladder\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
@@ -1302,52 +939,54 @@ 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)
                        {
                                lockteams = 1;
                                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;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd lockteams\n");
                        print("  No arguments required.\n");
                        print("See also: ^2unlockteams^7\n");
                        return;
+               }
        }
 }
 
 void GameCommand_make_mapinfo(float request) // UNTESTED
 {
-       entity tmp_entity;
-       
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2make_mapinfo^7: Automatically rebuild mapinfo files\n");
-                       return;
+               case GC_REQUEST_COMMAND:
+               { 
+                       entity tmp_entity;
                        
-               case GC_REQUEST_COMMAND: 
                        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
                        MapInfo_Enumerate();
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd make_mapinfo\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
@@ -1355,53 +994,54 @@ 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();
                        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)
 {
-       entity client;
-       string targets = argv(1);
-       string destination = argv(2);
-       string notify = argv(3);
-       float i;
-       argc = tokenizebyseparator(targets, ","); // re-use argc for the targets
-       
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2moveplayer^7: Change the team/status of a player\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+       
+                       string targets = strreplace(",", " ", argv(1));
+                       string original_targets = strreplace(" ", ", ", targets);
+                       string destination = argv(2);
+                       string notify = argv(3);
+                       
+                       string successful, t;
+                       
                        // lets see if the target(s) even actually exist.
                        if((targets) && (destination))
                        { 
-                               for(i = 0; i < argc; ++i)
+                               for(;targets;)
                                {
+                                       t = car(targets); targets = cdr(targets);
+
                                        // Check to see if the player is a valid target
-                                       if((stof(argv(i)) < 1) | (stof(argv(i)) > maxclients)) // player_id is out of range
+                                       if((GetFilteredNumber(t) < 1) || (GetFilteredNumber(t) > maxclients)) // player_id is out of range
                                        {
-                                               print(strcat("Player ", argv(i), " doesn't exist", (((i + 1) < argc) ? ", skipping to next player.\n" : ".\n")));
+                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (out of range)", (targets ? ", skipping to next player.\n" : ".\n"));
                                                continue; 
                                        }
-                                       client = edict_num(stof(argv(i)));
+                                       client = edict_num(GetFilteredNumber(t));
                                        if not(client.flags & FL_CLIENT) // player entity is not a client
                                        {
-                                               print(strcat("Player ", argv(i), " doesn't exist", (((i + 1) < argc) ? ", skipping to next player.\n" : ".\n")));
+                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (not a client)", (targets ? ", skipping to next player.\n" : ".\n"));
                                                continue;
                                        }
                                        
@@ -1412,12 +1052,14 @@ void GameCommand_moveplayer(float request, float argc)
                                                {
                                                        self = client;
                                                        PutObserverInServer();
+                                                       
+                                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
                                                }
                                                else
                                                {
-                                                       print("Player ", argv(i), " (", client.netname, ") is already spectating.\n");
+                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n");
                                                }
-                                               return;
+                                               continue;
                                        }
                                        else
                                        {
@@ -1435,8 +1077,8 @@ void GameCommand_moveplayer(float request, float argc)
                                                                if(team_color == client.team) // already on the destination team
                                                                {
                                                                        // keep the forcing undone
-                                                                       print("Player ", argv(i), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), ".\n");
-                                                                       return;
+                                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), (targets ? ", skipping to next player.\n" : ".\n"));
+                                                                       continue;
                                                                } 
                                                                else if(team_color == 0)  // auto team
                                                                {
@@ -1451,44 +1093,20 @@ void GameCommand_moveplayer(float request, float argc)
                                                                // Check to see if the destination team is even available
                                                                switch(team_color) 
                                                                {
-                                                                       case COLOR_TEAM1:
-                                                                               if(c1 == -1) {
-                                                                                       print("Sorry, can't move player to red team if it doesn't exist.\n");
-                                                                                       return;
-                                                                               }
-                                                                               break;
-
-                                                                       case COLOR_TEAM2:
-                                                                               if(c2 == -1) {
-                                                                                       print("Sorry, can't move player to blue team if it doesn't exist.\n");
-                                                                                       return;
-                                                                               }
-                                                                               break;
-
-                                                                       case COLOR_TEAM3:
-                                                                               if(c3 == -1) {
-                                                                                       print("Sorry, can't move player to yellow team if it doesn't exist.\n");
-                                                                                       return;
-                                                                               }
-                                                                               break;
-
-                                                                       case COLOR_TEAM4:
-                                                                               if(c4 == -1) {
-                                                                                       print("Sorry, can't move player to pink team if it doesn't exist.\n");
-                                                                                       return;
-                                                                               }
-                                                                               break;
-
-                                                                       default:
-                                                                               print("Sorry, can't move player here if team ", destination, " doesn't exist.\n");
-                                                                               return;
+                                                                       case COLOR_TEAM1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break;
+                                                                       
+                                                                       default: print("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); return;
                                                                }
                                                                
                                                                // If so, lets continue and finally move the player
                                                                client.team_forced = 0;
                                                                MoveToTeam(client, team_color, 6, stof(notify));
-                                                               print("Player ", argv(i), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n");
-                                                               return;
+                                                               successful = strcat(successful, (successful ? ", " : ""), client.netname);
+                                                               print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n");
+                                                               continue;
                                                        }
                                                        else
                                                        {
@@ -1503,13 +1121,20 @@ void GameCommand_moveplayer(float request, float argc)
                                                }
                                        }
                                }
-                               print("No acceptable players given, aborting.\n");
+                               
+                               if(successful)
+                                       bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
+                               else
+                                       print("No players given (", original_targets, ") are able to move.\n");
+                                       
                                return; // still correct parameters so return to avoid usage print
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2moveplayer^7\n");
                case GC_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("  'destination' is what to send the player to, be it team or spectating\n");
@@ -1519,8 +1144,9 @@ 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;
+               }
        }
 }
 
@@ -1528,11 +1154,8 @@ 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;
                        entity plr;
                        FOR_EACH_CLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
@@ -1545,12 +1168,15 @@ void GameCommand_nospectators(float request)
                        }
                        bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n"));
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd nospectators\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
@@ -1558,94 +1184,101 @@ 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();
                        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 // TODO: change the if statements for sub arguments to switches
-{
-       entity client;
-       float i, n, entno;
-       string s;
-       
+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:
-                       if(argv(1) == "read")
+               {
+                       entity client;
+                       float i, n, entno;
+                       string s;
+                       
+                       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:
                        print("Incorrect parameters for ^2radarmap^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd \n");
                        print("  FIXME: Arguments currently unknown\n");
                        return;
+               }
        }
 }
 
@@ -1653,84 +1286,42 @@ void GameCommand_printstats(float request)
 {
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2printstats^7: foobar\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
+               {
                        DumpStats(FALSE);
                        print("stats dumped.\n");
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd printstats\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
 void GameCommand_radarmap(float request, float argc)
 {
-       float i;
-       
        switch(request)
        {
-               case GC_REQUEST_HELP:
-                       print("  ^2radarmap^7: Generate a radar image of the map\n");
-                       return;
-                       
                case GC_REQUEST_COMMAND:
-                       if(!radarmapper)
-                       {
-                               radarmapper = spawn();
-                               radarmapper.classname = "radarmapper";
-                               radarmapper.think = RadarMap_Think;
-                               radarmapper.nextthink = time;
-                               radarmapper.count = 8; // default to the --trace method, as it is faster now
-                               radarmapper.ltime = 1;
-                               radarmapper.size = '512 512 1';
-
-                               for(i = 1; i < argc; ++i)
-                               {
-                                       switch(argv(i))
-                                       {
-                                               case "--force": { radarmapper.count |= 1; break; }
-                                               case "--loop": { radarmapper.count |= 2; break; }
-                                               case "--quit": { radarmapper.count |= 4; break; }
-                                               case "--block": { radarmapper.count &~= 24; break; }
-                                               case "--trace": { radarmapper.count &~= 24; radarmapper.count |= 8; break; }
-                                               case "--sample": { radarmapper.count &~= 24; radarmapper.count |= 16; break; }
-                                               case "--lineblock": { radarmapper.count |= 24; break; }
-                                               case "--flags": { ++i; radarmapper.count = stof(argv(i)); break; } // for the recursive call
-                                               case "--sharpen": { ++i; radarmapper.ltime = stof(argv(i)); break; } // for the recursive call
-                                               case "--res": // minor alias
-                                               case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; }
-                                               case "--qual": // minor alias
-                                               case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; }
-                                               
-                                               default: 
-                                                       i = argc; 
-                                                       remove(radarmapper);
-                                                       radarmapper = world;
-                                                       break;
-                                       }
-                               }
-                               
-                               if(radarmapper) // after doing the arguments, see if we successfully went forward. 
-                               {
-                                       print("Radarmap entity spawned.\n");
-                                       return; // if so, don't print usage.
-                               }
-                       }
+               {
+                       if(RadarMap_Make(argc))
+                               return;
+               }
                        
                default:
                        print("Incorrect parameters for ^2radarmap^7\n");
                case GC_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");
                        print("  trace supports no quality factor; its result should look like --block with infinite quality factor.\n");
                        return;
+               }
        }
 }
 
@@ -1738,44 +1329,45 @@ 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);
                        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)
 {
-       float i;
-       
        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;
+                       
                        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;
+               }
        }
 }
 
@@ -1783,20 +1375,150 @@ 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);
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd reducematchtime\n");
                        print("  No arguments required.\n");
                        print("See also: ^2extendmatchtime^7\n");
                        return;
+               }
+       }
+}
+
+void GameCommand_setbots(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2)
+                       {
+                               cvar_settemp("minplayers", "0");
+                               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");
+                       print("  Where 'botnumber' is the amount of bots to set bot_number cvar to.\n");
+                       print("See also: ^2bot_cmd^7\n");
+                       return;
+               }
+       }
+}
+
+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;
+               }
        }
 }
 
@@ -1806,20 +1528,17 @@ void GameCommand_stuffto(float request, float argc)
        // Because of this, it is disabled by default and must be enabled by the server owner when doing compilation. That way,
        // we can be certain they understand the risks of it... So to enable, compile server with -DSTUFFTO_ENABLED argument.
        
-       entity client;
-       float entno;
-       
        #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;
+                       float entno;
+                       
                        if(argc == 3)
                        {
-                               entno = stof(argv(1));
+                               entno = GetFilteredNumber(argv(1));
                                client = world;
                                if(entno <= maxclients)
                                        client = edict_num(entno);
@@ -1833,18 +1552,21 @@ void GameCommand_stuffto(float request, float argc)
                                
                                return;
                        }
+               }
                        
                default:
                        print("Incorrect parameters for ^2stuffto^7\n");
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd stuffto clientnumber command\n");
                        print("  FIXME: Arguments currently unknown\n");
                        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
@@ -1854,19 +1576,19 @@ 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);
                        return;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd teamstatus\n");
                        print("  No arguments required.\n");
                        return;
+               }
        }
 }
 
@@ -1874,11 +1596,8 @@ 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");
                        print("frame start = ", ftos(gettime(GETTIME_FRAMESTART)), "\n");
                        print("realtime = ", ftos(gettime(GETTIME_REALTIME)), "\n");
@@ -1887,33 +1606,33 @@ void GameCommand_time(float request)
                        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)
-{
-       entity e;
-       vector org, delta, start, end, p, q, q0, pos, vv, dv;
-       float i, f, safe, unsafe, dq, dqf;
-       
-       // TODO: Clean up all of these variables and merge the code below to use only a few
-                                               
+{                                              
        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
+                       entity e;
+                       vector org, delta, start, end, p, q, q0, pos, vv, dv;
+                       float i, f, safe, unsafe, dq, dqf;
+       
                        switch(argv(1))
                        {
                                case "debug":
+                               {
                                        print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
                                        for(;;)
                                        {
@@ -2002,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;
@@ -2031,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);
@@ -2042,8 +1765,10 @@ void GameCommand_trace(float request, float argc)
                                                        print("cannot walk\n");
                                                return;
                                        }
-                                               
+                               }
+                               
                                case "showline":
+                               {
                                        if(argc == 3)
                                        {
                                                vv = stov(argv(1));
@@ -2053,15 +1778,20 @@ 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");
                        print("  FIXME: Arguments currently unknown\n");
                        return;
+               }
        }
 }
 
@@ -2069,26 +1799,28 @@ 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)
                        {
                                lockteams = 0;
                                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;
+               }
                        
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd unlockteams\n");
                        print("  No arguments required.\n");
                        print("See also: ^2lockteams^7\n");
                        return;
+               }
        }
 }
 
@@ -2096,14 +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)));
@@ -2118,15 +1846,123 @@ void GameCommand_warp(float request, float argc)
                        else
                                print("Not in campaign, can't level warp\n");
                        return;
+               }
                
                default:
                case GC_REQUEST_USAGE:
+               {
                        print("\nUsage:^3 sv_cmd level\n");
                        print("  'level' is the level to change campaign mode to.\n");
                        return;
+               }
        }
 }
 
+/* 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 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,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") \
+       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(request, world, arguments, command), "Server side control of voting") /* handled in server/vote.qc */ \
+       /* nothing */
+
+void GameCommand_macro_help()
+{
+       #define SERVER_COMMAND(name,function,description) \
+               { print("  ^2", name, "^7: ", description, "\n"); }
+               
+       SERVER_COMMANDS(0, 0, "")
+       #undef SERVER_COMMAND
+       
+       return;
+}
+
+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)
+       #undef SERVER_COMMAND
+       
+       return FALSE;
+}
+
+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, "")
+       #undef SERVER_COMMAND
+       
+       return FALSE;
+}
+       
 
 // =========================================
 //  Main Function Called By Engine (sv_cmd)
@@ -2135,10 +1971,6 @@ void GameCommand_warp(float request, float argc)
 
 void GameCommand(string command)
 {
-       // ===== TODO list =====
-       // find all FIXME's and TODO'S and UNTESTED'S and finish them :P
-
-       float search_request_type;
        float argc = tokenize_console(command);
 
        if(strtolower(argv(0)) == "help") 
@@ -2146,57 +1978,18 @@ void GameCommand(string command)
                if(argc == 1) 
                {
                        print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
-                       GameCommand_adminmsg(GC_REQUEST_HELP, 0);
-                       GameCommand_allready(GC_REQUEST_HELP);
-                       GameCommand_allspec(GC_REQUEST_HELP, 0);
-                       GameCommand_anticheat(GC_REQUEST_HELP, 0);
-                       GameCommand_bbox(GC_REQUEST_HELP);
-                       GameCommand_bot_cmd(GC_REQUEST_HELP, 0);
-                       GameCommand_cointoss(GC_REQUEST_HELP, 0);
-                       GameCommand_cvar_changes(GC_REQUEST_HELP);
-                       GameCommand_cvar_purechanges(GC_REQUEST_HELP);
-                       GameCommand_database(GC_REQUEST_HELP, 0);
-                       GameCommand_defer_clear(GC_REQUEST_HELP, 0);
-                       GameCommand_defer_clear_all(GC_REQUEST_HELP);
-                       GameCommand_delrec(GC_REQUEST_HELP, 0);
-                       GameCommand_effectindexdump(GC_REQUEST_HELP);
-                       GameCommand_extendmatchtime(GC_REQUEST_HELP);
-                       GameCommand_find(GC_REQUEST_HELP, 0);
-                       GameCommand_gametype(GC_REQUEST_HELP, 0);
-                       GameCommand_gettaginfo(GC_REQUEST_HELP, 0);
-                       GameCommand_gotomap(GC_REQUEST_HELP, 0);
-                       GameCommand_ladder(GC_REQUEST_HELP);
-                       GameCommand_lockteams(GC_REQUEST_HELP);
-                       GameCommand_make_mapinfo(GC_REQUEST_HELP);
-                       GameCommand_modelbug(GC_REQUEST_HELP);
-                       GameCommand_moveplayer(GC_REQUEST_HELP, 0);
-                       GameCommand_nospectators(GC_REQUEST_HELP);
-                       GameCommand_onslaught_updatelinks(GC_REQUEST_HELP);
-                       GameCommand_playerdemo(GC_REQUEST_HELP, 0);
-                       GameCommand_printstats(GC_REQUEST_HELP);
-                       GameCommand_radarmap(GC_REQUEST_HELP, 0);
-                       GameCommand_rankings(GC_REQUEST_HELP);
-                       GameCommand_records(GC_REQUEST_HELP);
-                       GameCommand_reducematchtime(GC_REQUEST_HELP);
-                       GameCommand_stuffto(GC_REQUEST_HELP, 0);
-                       GameCommand_teamstatus(GC_REQUEST_HELP);
-                       GameCommand_time(GC_REQUEST_HELP);
-                       GameCommand_trace(GC_REQUEST_HELP, 0);
-                       GameCommand_unlockteams(GC_REQUEST_HELP);
-                       GameCommand_warp(GC_REQUEST_HELP, 0);
-                       GameCommand_Vote("help", world);
+                       GameCommand_macro_help();
+                       
                        GameCommand_Ban("help");
                        GameCommand_Generic("help");
                        print("For help about specific commands, type sv_cmd help COMMAND\n");
                        return;
                } 
-               else
-                       search_request_type = GC_REQUEST_USAGE; // Instead of trying to call a command, we're going to see detailed information about it
+               else if(GameCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+               {
+                       return;
+               }
        } 
-       else if(GameCommand_Vote(command, world)) 
-       {
-               return; // handled by server/vote.qc 
-       }
        else if(GameCommand_Ban(command)) 
        {
                return; // handled by server/ipban.qc
@@ -2205,54 +1998,13 @@ void GameCommand(string command)
        {
                return; // handled by common/gamecommand.qc
        }
-       else
-               search_request_type = GC_REQUEST_COMMAND; // continue as usual and scan for normal commands
-               
-       switch(strtolower((search_request_type == GC_REQUEST_USAGE) ? argv(1) : argv(0))) // if first argument is help, then search for the second argument. Else, search for first. 
+       else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
        {
-               // Do not hard code aliases for these, instead create them in defaultXonotic.cfg
-               // also: keep in alphabetical order, please ;)
-               
-               case "adminmsg": GameCommand_adminmsg(search_request_type, argc); break;
-               case "allready": GameCommand_allready(search_request_type); break;
-               case "allspec": GameCommand_allspec(search_request_type, argc); break;
-               case "anticheat": GameCommand_anticheat(search_request_type, argc); break;
-               case "bbox": GameCommand_bbox(search_request_type); break;
-               case "bot_cmd": GameCommand_bot_cmd(search_request_type, argc); break;
-               case "cointoss": GameCommand_cointoss(search_request_type, argc); break; 
-               case "cvar_changes": GameCommand_cvar_changes(search_request_type); break; 
-               case "cvar_purechanges": GameCommand_cvar_purechanges(search_request_type); break; 
-               case "database": GameCommand_database(search_request_type, argc); break;
-               case "defer_clear": GameCommand_defer_clear(search_request_type, argc); break;
-               case "defer_clear_all": GameCommand_defer_clear_all(search_request_type); break;
-               case "delrec": GameCommand_delrec(search_request_type, argc); break;
-               case "effectindexdump": GameCommand_effectindexdump(search_request_type); break;
-               case "extendmatchtime": GameCommand_extendmatchtime(search_request_type); break;
-               case "find": GameCommand_find(search_request_type, argc); break; 
-               case "gametype": GameCommand_gametype(search_request_type, argc); break;
-               case "gettaginfo": GameCommand_gettaginfo(search_request_type, argc); break;
-               case "gotomap": GameCommand_gotomap(search_request_type, argc); break;
-               case "ladder": GameCommand_ladder(search_request_type); break;
-               case "lockteams": GameCommand_lockteams(search_request_type); break;
-               case "make_mapinfo": GameCommand_make_mapinfo(search_request_type); break;
-               case "modelbug": GameCommand_modelbug(search_request_type); break;
-               case "moveplayer": GameCommand_moveplayer(search_request_type, argc); break;
-               case "nospectators": GameCommand_nospectators(search_request_type); break;
-               case "onslaught_updatelinks": GameCommand_onslaught_updatelinks(search_request_type); break;
-               case "playerdemo": GameCommand_playerdemo(search_request_type, argc); break;
-               case "printstats": GameCommand_printstats(search_request_type); break;
-               case "radarmap": GameCommand_radarmap(search_request_type, argc); break;
-               case "rankings": GameCommand_rankings(search_request_type); break;
-               case "records": GameCommand_records(search_request_type); break;
-               case "reducematchtime": GameCommand_reducematchtime(search_request_type); break;
-               case "stuffto": GameCommand_stuffto(search_request_type, argc); break;
-               case "teamstatus": GameCommand_teamstatus(search_request_type); break;
-               case "time": GameCommand_time(search_request_type); break;
-               case "trace": GameCommand_trace(search_request_type, argc); break;
-               case "unlockteams": GameCommand_unlockteams(search_request_type); break;
-               case "warp": GameCommand_warp(search_request_type, argc); break;
-               
-               default:
-                       print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+               return; // handled by one of the above GameCommand_* functions
        }
+       
+       // 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");
+       
+       return;
 }
\ No newline at end of file