X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=2dd52317569ab862e62a3a01ae56fe98c1b1761f;hp=68a8e9f10d3cae65454eb779806e4531f7a728e2;hb=64b6c7420b3e1c307f408a9f17d9c765a268621a;hpb=3981d04edeb44609c738d08276403daf2760a0f4

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 68a8e9f10..2dd523175 100644
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1,6 +1,6 @@
 // =====================================================
 //  Server side game commands code, reworked by Samual
-//  Last updated: December 25th, 2011
+//  Last updated: December 29th, 2011
 // =====================================================
 
 //  used by GameCommand_make_mapinfo()
@@ -61,34 +61,6 @@ void changematchtime(float delta, float mi, float ma)
 	cvar_set("timelimit", ftos(new / 60));
 }
 
-//  used by GameCommand_modelbug() // Samual: is this even needed?
-float g_clientmodel_genericsendentity (entity to, float sf);
-void modelbug_make_svqc();
-void modelbug_make_csqc()
-{
-	Net_LinkEntity(self, TRUE, 0, g_clientmodel_genericsendentity);
-	self.think = modelbug_make_svqc;
-	self.nextthink = time + 1;
-	setorigin(self, self.origin - '0 0 8');
-}
-void modelbug_make_svqc()
-{
-	self.SendEntity = func_null;
-	self.think = modelbug_make_csqc;
-	self.nextthink = time + 1;
-	setorigin(self, self.origin + '0 0 8');
-}
-void modelbug()
-{
-	entity e;
-	e = spawn();
-	setorigin(e, nextent(world).origin);
-	precache_model("models_portal.md3");
-	setmodel(e, "models/portal.md3");
-	e.think = modelbug_make_svqc;
-	e.nextthink = time + 1;
-}
-
 
 // =======================
 //  Command Sub-Functions
@@ -109,6 +81,7 @@ void GameCommand_adminmsg(float request, float argc)
 			float infobartime = stof(argv(3));
 			
 			string successful, t;
+			successful = string_null;
 			
 			if((targets) && (admin_message))
 			{
@@ -145,7 +118,7 @@ void GameCommand_adminmsg(float request, float argc)
 				if(successful)
 					bprint("Successfully sent message '", admin_message, "' to ", successful, ".\n");
 				else
-					print("No players given (", original_targets, ") could recieve the message.\n");
+					print("No players given (", original_targets, ") could receive the message.\n");
 					
 				return;
 			}
@@ -194,7 +167,7 @@ void GameCommand_allspec(float request, float argc)
 		{
 			entity client;
 			string reason = argv(1);
-			float i;
+			float i = 0;
 			
 			FOR_EACH_REALPLAYER(client)
 			{
@@ -224,7 +197,7 @@ void GameCommand_anticheat(float request, float argc)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			entity client = GetFilteredEntity(argv(1));
+			entity client = GetIndexedEntity(argc, 1);
 			float accepted = VerifyClientEntity(client, FALSE, FALSE);
 			
 			if(accepted > 0) 
@@ -250,7 +223,7 @@ void GameCommand_anticheat(float request, float argc)
 	}
 }
 
-void GameCommand_bbox(float request) // legacy
+void GameCommand_bbox(float request) 
 {
 	switch(request)
 	{
@@ -337,13 +310,13 @@ void GameCommand_bbox(float request) // legacy
 		{
 			print("\nUsage:^3 sv_cmd bbox\n");
 			print("  No arguments required.\n");
-			print("See also: ^2gettaginfo^7\n");
+			print("See also: ^2gettaginfo, trace^7\n");
 			return;
 		}
 	}
 }
 
-void GameCommand_bot_cmd(float request, float argc) // legacy
+void GameCommand_bot_cmd(float request, float argc, string command)
 {
 	switch(request)
 	{
@@ -356,6 +329,17 @@ void GameCommand_bot_cmd(float request, float argc) // legacy
 				bot_resetqueues();
 				return;
 			}
+			else if(argv(1) == "setbots")
+			{
+				cvar_settemp("bot_vs_human", "0");
+				cvar_settemp("minplayers", "0");
+				cvar_settemp("bot_number", "0");
+				bot_fixcount();
+				cvar_settemp("bot_number", argv(2));
+				if(!bot_fixcount())
+					print("Sorry, could not set requested bot count\n");
+				return;
+			}
 			else if(argv(1) == "load" && argc == 3)
 			{
 				float fh, i;
@@ -380,7 +364,10 @@ void GameCommand_bot_cmd(float request, float argc) // legacy
 						}
 						else if(argv(2) == "setbots")
 						{
+							cvar_settemp("bot_vs_human", "0");
 							cvar_settemp("minplayers", "0");
+							cvar_settemp("bot_number", "0");
+							bot_fixcount();
 							cvar_settemp("bot_number", argv(3));
 							if(!bot_fixcount())
 								print("Sorry, could not set requested bot count\n");
@@ -392,7 +379,7 @@ void GameCommand_bot_cmd(float request, float argc) // legacy
 							if(bot == world)
 								bot = find_bot_by_name(argv(2));
 							if(bot)
-								bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
+								bot_queuecommand(bot, substring(s, argv_start_index(3), -1));
 						}
 					}
 					else
@@ -419,8 +406,8 @@ void GameCommand_bot_cmd(float request, float argc) // legacy
 					bot = find_bot_by_name(argv(1));
 				if(bot)
 				{
-					print(strcat("Command '", strcat(argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
-					bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
+					print(strcat("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname, "\n"));
+					bot_queuecommand(bot, substring(command, argv_start_index(2), -1));
 					return;
 				}
 				else
@@ -435,8 +422,8 @@ void GameCommand_bot_cmd(float request, float argc) // legacy
 			print("\nUsage:^3 sv_cmd bot_cmd client command [argument]\n");
 			print("  'client' can be either the name or entity id of the bot\n");
 			print("  For full list of commands, see bot_cmd help [command].\n");
-			print("Examples: bot_cmd <id> cc \"say something\"\n");
-			print("          bot_cmd <id> presskey jump\n");
+			print("Examples: sv_cmd bot_cmd client cc \"say something\"\n");
+			print("          sv_cmd bot_cmd client presskey jump\n");
 			return;
 		}
 	}
@@ -469,7 +456,7 @@ void GameCommand_cointoss(float request, float argc)
 	}
 }
 
-void GameCommand_database(float request, float argc) // legacy
+void GameCommand_database(float request, float argc) 
 {
 	switch(request)
 	{
@@ -521,15 +508,15 @@ void GameCommand_defer_clear(float request, float argc)
 			entity client;
 			float accepted;
 			
-			if(argc == 2)
+			if(argc >= 2)
 			{
-				client = GetFilteredEntity(argv(1));
+				client = GetIndexedEntity(argc, 1);
 				accepted = VerifyClientEntity(client, TRUE, FALSE);
 				
 				if(accepted > 0)
 				{
 					stuffcmd(client, "defer clear\n");
-					print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
+					print("defer clear stuffed to ", client.netname, "\n");
 				}
 				else { print("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); }
 				
@@ -556,7 +543,7 @@ void GameCommand_defer_clear_all(float request)
 		case CMD_REQUEST_COMMAND:
 		{
 			entity client;
-			float i;
+			float i = 0;
 			float argc;
 			
 			FOR_EACH_CLIENT(client)
@@ -580,7 +567,7 @@ void GameCommand_defer_clear_all(float request)
 	}
 }
 
-void GameCommand_delrec(float request, float argc) // legacy // perhaps merge later with records and printstats and such?
+void GameCommand_delrec(float request, float argc)  // perhaps merge later with records and printstats and such?
 {
 	switch(request)
 	{
@@ -609,7 +596,7 @@ void GameCommand_delrec(float request, float argc) // legacy // perhaps merge la
 	}
 }
 
-void GameCommand_effectindexdump(float request) // legacy
+void GameCommand_effectindexdump(float request) 
 {
 	switch(request)
 	{
@@ -687,13 +674,13 @@ void GameCommand_effectindexdump(float request) // legacy
 	}
 }
 
-void GameCommand_extendmatchtime(float request) // legacy
+void GameCommand_extendmatchtime(float request) 
 {
 	switch(request)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+			changematchtime(autocvar_timelimit_increment * 60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
 			return;
 		}
 			
@@ -708,7 +695,7 @@ void GameCommand_extendmatchtime(float request) // legacy
 	}
 }
 
-void GameCommand_find(float request, float argc) // legacy // is this even needed? We have prvm_edicts command and such ANYWAY
+void GameCommand_find(float request, float argc)  // is this even needed? We have prvm_edicts command and such ANYWAY
 {	
 	switch(request)
 	{
@@ -733,31 +720,35 @@ void GameCommand_find(float request, float argc) // legacy // is this even neede
 	}
 }
 
-void GameCommand_gametype(float request, float argc) // legacy
+void GameCommand_gametype(float request, float argc) 
 {	
 	switch(request)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			string s = argv(1);
-			float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
-			
-			if(t)
+			if(argv(1) != "")
 			{
-				MapInfo_SwitchGameType(t);
-				MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
-				if(MapInfo_count > 0)
-					bprint("Game type successfully switched to ", s, "\n");
-				else
+				string s = argv(1);
+				float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
+				
+				if(t)
 				{
-					bprint("Cannot use this game type: no map for it found\n");
-					MapInfo_SwitchGameType(tsave);
+					MapInfo_SwitchGameType(t);
 					MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+					if(MapInfo_count > 0)
+						bprint("Game type successfully switched to ", s, "\n");
+					else
+					{
+						bprint("Cannot use this game type: no map for it found\n");
+						MapInfo_SwitchGameType(tsave);
+						MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+					}
 				}
+				else
+					bprint("Game type switch to ", s, " failed: this type does not exist!\n");
+					
+				return;
 			}
-			else
-				bprint("Game type switch to ", s, " failed: this type does not exist!\n");
-			return;
 		}
 			
 		default:
@@ -772,7 +763,7 @@ void GameCommand_gametype(float request, float argc) // legacy
 	}
 }
 
-void GameCommand_gettaginfo(float request, float argc) // legacy
+void GameCommand_gettaginfo(float request, float argc) 
 {	
 	switch(request)
 	{
@@ -826,7 +817,65 @@ void GameCommand_gettaginfo(float request, float argc) // legacy
 		case CMD_REQUEST_USAGE:
 		{
 			print("\nUsage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n");
-			print("See also: ^2bbox^7\n");
+			print("See also: ^2bbox, trace^7\n");
+			return;
+		}
+	}
+}
+
+void GameCommand_animbench(float request, float argc) 
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			entity tmp_entity;
+			float i;
+			vector v;
+
+			if(argc >= 4)
+			{
+				tmp_entity = spawn();
+				if(argv(1) == "w")
+					setmodel(tmp_entity, (nextent(world)).weaponentity.model);
+				else
+				{
+					precache_model(argv(1));
+					setmodel(tmp_entity, argv(1));
+				}
+				float f1 = stof(argv(2));
+				float f2 = stof(argv(3));
+				float t0;
+				float t1 = 0;
+				float t2 = 0;
+				float n = 0;
+
+				while(t1 + t2 < 1)
+				{
+					tmp_entity.frame = f1;
+					t0 = gettime(GETTIME_HIRES);
+					getsurfacepoint(tmp_entity, 0, 0);
+					t1 += gettime(GETTIME_HIRES) - t0;
+					tmp_entity.frame = f2;
+					t0 = gettime(GETTIME_HIRES);
+					getsurfacepoint(tmp_entity, 0, 0);
+					t2 += gettime(GETTIME_HIRES) - t0;
+					n += 1;
+				}
+				print("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s\n");
+				print("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s\n");
+
+				remove(tmp_entity);
+				return;
+			}
+		}
+
+		default:
+			print("Incorrect parameters for ^2gettaginfo^7\n");
+		case CMD_REQUEST_USAGE:
+		{
+			print("\nUsage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n");
+			print("See also: ^2bbox, trace^7\n");
 			return;
 		}
 	}
@@ -838,7 +887,7 @@ void GameCommand_gotomap(float request, float argc)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			if(argc == 2)
+			if(argv(1))
 			{
 				print(GotoMap(argv(1)), "\n");
 				return;
@@ -886,7 +935,7 @@ void GameCommand_lockteams(float request)
 	}
 }
 
-void GameCommand_make_mapinfo(float request) // legacy
+void GameCommand_make_mapinfo(float request) 
 {
 	switch(request)
 	{
@@ -907,26 +956,7 @@ void GameCommand_make_mapinfo(float request) // legacy
 		{
 			print("\nUsage:^3 sv_cmd make_mapinfo\n");
 			print("  No arguments required.\n");
-			return;
-		}
-	}
-}
-
-void GameCommand_modelbug(float request) // legacy
-{
-	switch(request)
-	{
-		case CMD_REQUEST_COMMAND:
-		{
-			modelbug();
-			return;
-		}
-			
-		default:
-		case CMD_REQUEST_USAGE:
-		{
-			print("\nUsage:^3 sv_cmd modelbug\n");
-			print("  No arguments required.\n");
+			print("See also: ^2radarmap^7\n");
 			return;
 		}
 	}
@@ -947,6 +977,7 @@ void GameCommand_moveplayer(float request, float argc)
 			string notify = argv(3);
 			
 			string successful, t;
+			successful = string_null;
 			
 			// lets see if the target(s) even actually exist.
 			if((targets) && (destination))
@@ -1062,15 +1093,15 @@ void GameCommand_moveplayer(float request, float argc)
 			print("  'notify' is whether or not to send messages notifying of the move. Detail below.\n");
 			print("    0 (00) automove centerprint, admin message; 1 (01) automove centerprint, no admin message\n");
 			print("    2 (10) no centerprint, admin message; 3 (11) no centerprint, no admin message\n");
-			print("Examples: moveplayer 1,3,5 red 3\n");
-			print("          moveplayer 2 spec \n");
+			print("Examples: sv_cmd moveplayer 1,3,5 red 3\n");
+			print("          sv_cmd moveplayer 2 spec \n");
 			print("See also: ^2allspec, shuffleteams^7\n");
 			return;
 		}
 	}
 }
 
-void GameCommand_nospectators(float request) // legacy
+void GameCommand_nospectators(float request) 
 {
 	switch(request)
 	{
@@ -1100,28 +1131,7 @@ void GameCommand_nospectators(float request) // legacy
 	}
 }
 
-void GameCommand_onslaught_updatelinks(float request) // legacy // todo: should this be here? Perhaps some mutatorhook call instead....
-{
-	switch(request)
-	{
-		case CMD_REQUEST_COMMAND:
-		{
-			onslaught_updatelinks();
-			print("ONS links updated\n");
-			return;
-		}
-			
-		default:
-		case CMD_REQUEST_USAGE:
-		{
-			print("\nUsage:^3 sv_cmd onslaught_updatelinks\n");
-			print("  No arguments required.\n");
-			return;
-		}
-	}
-}
-
-void GameCommand_playerdemo(float request, float argc) // legacy
+void GameCommand_playerdemo(float request, float argc)
 {	
 	switch(request)
 	{
@@ -1136,7 +1146,7 @@ void GameCommand_playerdemo(float request, float argc) // legacy
 				{
 					case "read":
 					{
-						client = GetFilteredEntity(argv(2));
+						client = GetIndexedEntity(argc, 2);
 						accepted = VerifyClientEntity(client, FALSE, TRUE);
 						
 						if not(accepted > 0) 
@@ -1146,13 +1156,13 @@ void GameCommand_playerdemo(float request, float argc) // legacy
 						}
 						
 						self = client;
-						playerdemo_open_read(argv(3));
+						playerdemo_open_read(argv(next_token));
 						return;
 					}
 					
 					case "write":
 					{
-						client = GetFilteredEntity(argv(2));
+						client = GetIndexedEntity(argc, 2);
 						accepted = VerifyClientEntity(client, FALSE, FALSE);
 						
 						if not(accepted > 0) 
@@ -1162,7 +1172,7 @@ void GameCommand_playerdemo(float request, float argc) // legacy
 						}
 						
 						self = client;
-						playerdemo_open_write(argv(3));
+						playerdemo_open_write(argv(next_token));
 						return;
 					}
 					
@@ -1202,7 +1212,7 @@ void GameCommand_playerdemo(float request, float argc) // legacy
 	}
 }
 
-void GameCommand_printstats(float request) // legacy
+void GameCommand_printstats(float request) 
 {
 	switch(request)
 	{
@@ -1240,18 +1250,19 @@ void GameCommand_radarmap(float request, float argc)
 			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");
+			print("See also: ^2make_mapinfo^7\n");
 			return;
 		}
 	}
 }
 
-void GameCommand_reducematchtime(float request) // legacy
+void GameCommand_reducematchtime(float request) 
 {
 	switch(request)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+			changematchtime(autocvar_timelimit_decrement *-60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
 			return;
 		}
 			
@@ -1301,10 +1312,12 @@ void GameCommand_shuffleteams(float request)
 		{
 			if(teamplay)
 			{
-				entity tmp_player, client;
-				float i, x, z, t_teams, t_players, team_color, accepted;
+				entity tmp_player;
+				float i, x, z, t_teams, t_players, team_color;
 
 				// count the total amount of players and total amount of teams
+				t_players = 0;
+				t_teams = 0;
 				FOR_EACH_PLAYER(tmp_player)
 				{
 					CheckAllowedTeams(tmp_player);
@@ -1408,22 +1421,18 @@ void GameCommand_stuffto(float request, float argc)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			entity client;
-			float entno;
-			
-			if(argc == 3)
+			if(argv(2))
 			{
-				entno = GetFilteredNumber(argv(1));
-				client = world;
-				if(entno <= maxclients)
-					client = edict_num(entno);
-				if(client.flags & FL_CLIENT)
+				entity client = GetIndexedEntity(argc, 1);
+				float accepted = VerifyClientEntity(client, TRUE, FALSE);
+				
+				if(accepted > 0)
 				{
-					stuffcmd(client, strcat("\n", argv(2), "\n"));
-					print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
+					stuffcmd(client, strcat("\n", argv(next_token), "\n"));
+					print(strcat("Command: \"", argv(next_token), "\" sent to ", GetCallerName(client), " (", argv(1) ,").\n"));
 				}
 				else
-					print(strcat("Client (", argv(1) ,") not found.\n"));
+					print("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); 
 				
 				return;
 			}
@@ -1449,12 +1458,11 @@ void GameCommand_stuffto(float request, float argc)
 }
 
 void GameCommand_trace(float request, float argc)
-{						
+{
 	switch(request)
 	{
 		case CMD_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;
@@ -1489,7 +1497,6 @@ void GameCommand_trace(float request, float argc)
 							{
 								rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid
 								tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
-								tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
 
 								if(trace_startsolid)
 								{
@@ -1618,8 +1625,9 @@ void GameCommand_trace(float request, float argc)
 			print("Incorrect parameters for ^2trace^7\n");
 		case CMD_REQUEST_USAGE:
 		{
-			print("\nUsage:^3 sv_cmd trace command [arguments]\n");
-			print("  TODO: Arguments currently unknown\n");
+			print("\nUsage:^3 sv_cmd trace command (startpos endpos)\n");
+			print("  Full list of commands here: \"debug, debug2, walk, showline.\"\n");
+			print("See also: ^2bbox, gettaginfo^7\n");
 			return;
 		}
 	}
@@ -1681,14 +1689,16 @@ void GameCommand_warp(float request, float argc)
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			print("\nUsage:^3 sv_cmd level\n");
+			print("\nUsage:^3 sv_cmd warp [level]\n");
 			print("  'level' is the level to change campaign mode to.\n");
+			print("  if 'level' is not provided it will change to the next level.\n");
 			return;
 		}
 	}
 }
 
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
 void GameCommand_(float request)
 {
 	switch(request)
@@ -1716,16 +1726,16 @@ void GameCommand_(float request)
 // ==================================
 
 // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+// Common commands have double indentation to separate them a bit.
 #define SERVER_COMMANDS(request,arguments,command) \
 	SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \
 	SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \
 	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("animbench", GameCommand_animbench(request, arguments), "Benchmark model animation (LAGS)") \
 	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("bot_cmd", GameCommand_bot_cmd(request, arguments, command), "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", CommonCommand_cvar_changes(request, world), "Prints a list of all changed server cvars") \
-	SERVER_COMMAND("cvar_purechanges", CommonCommand_cvar_purechanges(request, world), "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") \
@@ -1736,35 +1746,20 @@ void GameCommand_(float request)
 	SERVER_COMMAND("gametype", GameCommand_gametype(request, arguments), "Simple command to change the active gametype") \
 	SERVER_COMMAND("gettaginfo", GameCommand_gettaginfo(request, arguments), "Get specific information about a weapon model") \
 	SERVER_COMMAND("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \
-	SERVER_COMMAND("info", CommonCommand_info(request, world, arguments), "todo") \
-	SERVER_COMMAND("ladder", CommonCommand_ladder(request, world), "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("lsmaps", CommonCommand_lsmaps(request, world), "List maps which can be used with the current game mode") \
-	SERVER_COMMAND("lsnewmaps", CommonCommand_lsnewmaps(request, world), "todo") \
 	SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
-	SERVER_COMMAND("maplist", CommonCommand_maplist(request, world), "Display full server maplist reply") \
-	SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \
 	SERVER_COMMAND("moveplayer", GameCommand_moveplayer(request, arguments), "Change the team/status of a player") \
 	SERVER_COMMAND("nospectators", GameCommand_nospectators(request), "Automatically remove spectators from a match") \
-	SERVER_COMMAND("onslaught_updatelinks", GameCommand_onslaught_updatelinks(request), "Refresh link status for onslaught") \
 	SERVER_COMMAND("playerdemo", GameCommand_playerdemo(request, arguments), "Control the ability to save demos of players") \
-	SERVER_COMMAND("printstats", GameCommand_printstats(request), "TODO foobar") \
+	SERVER_COMMAND("printstats", GameCommand_printstats(request), "Dump eventlog player stats and other score information") \
 	SERVER_COMMAND("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \
-	SERVER_COMMAND("rankings", CommonCommand_rankings(request, world), "Print information about rankings") \
-	SERVER_COMMAND("records", CommonCommand_records(request, world), "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", CommonCommand_teamstatus(request, world), "Show information about player and team scores") \
-	SERVER_COMMAND("time", CommonCommand_time(request, world), "Print different formats/readouts of time") \
-	SERVER_COMMAND("timein", CommonCommand_timein(request, world), "Resume the game from being paused with a timeout") \
-	SERVER_COMMAND("timeout", CommonCommand_timeout(request, world), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
 	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("who", CommonCommand_who(request, world, arguments), "Display detailed client information about all players") \
-	SERVER_COMMAND("vote", VoteCommand(request, world, arguments, command), "Server side control of voting") \
 	/* nothing */
 
 void GameCommand_macro_help()
@@ -1799,6 +1794,17 @@ float GameCommand_macro_usage(float argc)
 	
 	return FALSE;
 }
+
+void GameCommand_macro_write_aliases(float fh)
+{
+	#define SERVER_COMMAND(name,function,description) \
+		{ CMD_Write_Alias("qc_cmd_sv", name, description); }
+		
+	SERVER_COMMANDS(0, 0, "")
+	#undef SERVER_COMMAND
+	
+	return;
+}
 	
 
 // =========================================
@@ -1819,26 +1825,51 @@ void GameCommand(string command)
 	{
 		if(argc == 1) 
 		{
-			print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
+			print("\nServer console commands:\n");
 			GameCommand_macro_help();
 			
-			GameCommand_Ban("help");
-			GameCommand_Generic("help");
-			print("For help about specific commands, type sv_cmd help COMMAND\n");
+			print("\nBanning commands:\n");
+			BanCommand_macro_help();
+			
+			print("\nCommon networked commands:\n");
+			CommonCommand_macro_help(world);
+			
+			print("\nGeneric commands shared by all programs:\n");
+			GenericCommand_macro_help();
+			
+			print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n");
+			print("For help about a specific command, type sv_cmd help COMMAND\n");
+			
 			return;
 		} 
-		else if(GameCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+		else if(BanCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+		{
+			return;
+		}
+		else if(CommonCommand_macro_usage(argc, world)) // same here, but for common commands instead
+		{
+			return;
+		}
+		else if(GenericCommand_macro_usage(argc)) // same here, but for generic commands instead
+		{
+			return;
+		}
+		else if(GameCommand_macro_usage(argc)) // finally try for normal commands too
 		{
 			return;
 		}
 	} 
-	else if(GameCommand_Ban(command)) 
+	else if(BanCommand(command)) 
+	{
+		return; // handled by server/command/ipban.qc
+	}
+	else if(CommonCommand_macro_command(argc, world, command))
 	{
-		return; // handled by server/ipban.qc
+		return; // handled by server/command/common.qc
 	}
-	else if(GameCommand_Generic(command)) 
+	else if(GenericCommand(command)) 
 	{
-		return; // handled by common/gamecommand.qc
+		return; // handled by common/command/generic.qc
 	}
 	else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
 	{
@@ -1849,4 +1880,4 @@ void GameCommand(string command)
 	print(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help.\n");
 	
 	return;
-}
\ No newline at end of file
+}