X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fgamecommand.qc;h=ecad7948ee66d1ee0ddce47dc03c43d1a4fd1d99;hb=0b4ded048cad2d4e9fcb61d7c38f14e30dbf6206;hp=496467b863adcf9e9d8d15ae9118f8444411fa3d;hpb=a1b5a66c89bbd2ec694ffda790fa52789c4e75a1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
index 496467b86..ecad7948e 100644
--- a/qcsrc/server/gamecommand.qc
+++ b/qcsrc/server/gamecommand.qc
@@ -1,404 +1,22 @@
+// =====================================================
+//  Server side game commands code, reworked by Samual
+//  Last updated: November 4th, 2011
+// =====================================================
+
 #define GC_REQUEST_HELP 1
 #define GC_REQUEST_COMMAND 2
 #define GC_REQUEST_USAGE 3
 
-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);
 
-// ======================
-//  Supporting Functions
-// ======================
-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;
-}
-
-// rough map entity
-//   cnt: current line
-//   size: pixel width/height
-//   maxs: cell width/height
-//   frame: counter
-void RadarMap_Think()
-{
-	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();
-	}
-}
+// ============================
+//  Misc. Supporting Functions
+// ============================
 
 //  used by GameCommand_make_mapinfo()
 void make_mapinfo_Think()
@@ -475,7 +93,6 @@ void modelbug_make_svqc()
 	self.nextthink = time + 1;
 	setorigin(self, self.origin + '0 0 8');
 }
-
 void modelbug()
 {
 	entity e;
@@ -488,9 +105,9 @@ void modelbug()
 }
 
 
-// =====================
-//  Command Controllers
-// =====================
+// =======================
+//  Command Sub-Functions
+// =======================
 
 void GameCommand_adminmsg(float request, float argc)
 {
@@ -529,24 +146,24 @@ void GameCommand_adminmsg(float request, float argc)
 						}
 						else
 						{
-							centerprint_atprio(client, CENTERPRIO_ADMIN, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
+							centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
 							sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
 						}
 						dprint("Message sent to ", client.netname, "\n");
 						++n;
 					}
 				}
-				if(!n) { print("Client not found\n"); } 
+				if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } 
 				return;
 			} 
 			
 		default:
-			print("Incorrect parameters for \"adminmsg\"\n");
+			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 message will last for ten seconds\" 10\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;
 	}
@@ -572,7 +189,7 @@ void GameCommand_allready(float request)
 	}
 }
 
-void GameCommand_allspec(float request) // todo: Add ability to provide a reason string?
+void GameCommand_allspec(float request, float argc)
 {
 	entity client;
 	float i;
@@ -590,13 +207,14 @@ void GameCommand_allspec(float request) // todo: Add ability to provide a reason
 				PutObserverInServer();
 				++i;
 			}
-			if(i) { bprint(strcat("Successfully forced all players to spectate (", ftos(i), ")\n")); } // should a message be added if no players were found? 
+			if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (argv(1) ? strcat(" for reason: '", argv(1), "'") : ""), ".\n")); }
+			else { print("No players found to spectate.\n"); }
 			return;
 			
 		default:
 		case GC_REQUEST_USAGE:
-			print("\nUsage:^3 sv_cmd allspec\n");
-			print("  No arguments required.\n");
+			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");
 			return;
 	}
@@ -628,10 +246,10 @@ void GameCommand_anticheat(float request, float argc) // FIXME: player entity is
 			return;
 			
 		default:
-			print("Incorrect parameters for \"anticheat\"\n");
+			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");
+			print("  where 'clientnumber' is player entity number.\n");
 			return;
 	}
 }
@@ -763,12 +381,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"));
@@ -794,7 +426,7 @@ 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;
 				}
@@ -803,7 +435,7 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
 			}
 			
 		default:
-			print("Incorrect parameters for \"bot_cmd\"\n");
+			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");
@@ -814,10 +446,12 @@ void GameCommand_bot_cmd(float request, float argc) // what a mess... old old co
 	}
 }
 
-void GameCommand_cointoss(float request) // todo: Perhaps add the ability to give your own arguments to pick between? (Like player names)
+void GameCommand_cointoss(float request, float argc)
 {
 	entity client;
-	float choice = (random() > 0.5);
+	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)
 	{
@@ -827,14 +461,14 @@ void GameCommand_cointoss(float request) // todo: Perhaps add the ability to giv
 			
 		case GC_REQUEST_COMMAND:
 			FOR_EACH_CLIENT(client)
-				centerprint(client, strcat("^3Throwing coin... Result: ", (choice ? "^1HEADS^3!\n" : "^4TAILS^3!\n")));
-			bprint(strcat("^3Throwing coin... Result: ", (choice ? "^1HEADS^3!\n" : "^4TAILS^3!\n")));
+				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\n");
-			print("  No arguments required.\n");
+			print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n");
+			print("  Where 'result1' and 'result2' are user created options.\n");
 			return;
 	}
 }
@@ -853,7 +487,7 @@ void GameCommand_cvar_changes(float request)
 			
 		default:
 		case GC_REQUEST_USAGE:
-			print("\nUsage:^3 sv_cmd \n");
+			print("\nUsage:^3 sv_cmd cvar_changes\n");
 			print("  No arguments required.\n");
 			print("See also: ^2cvar_purechanges^7\n");
 			return;
@@ -914,7 +548,7 @@ void GameCommand_database(float request, float argc)
 			}
 			
 		default:
-			print("Incorrect parameters for \"database\"\n");
+			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");
@@ -958,7 +592,7 @@ void GameCommand_defer_clear(float request, float argc)
 			}
 		
 		default:
-			print("Incorrect parameters for \"defer_clear\"\n");
+			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");
@@ -998,7 +632,7 @@ void GameCommand_defer_clear_all(float request)
 	}
 }
 
-void GameCommand_delrec(float request, float argc) // UNTESTED
+void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
 {
 	switch(request)
 	{
@@ -1017,7 +651,7 @@ void GameCommand_delrec(float request, float argc) // UNTESTED
 			}
 			
 		default:
-			print("Incorrect parameters for \"delrec\"\n");
+			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");
@@ -1081,7 +715,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")
@@ -1105,7 +739,7 @@ void GameCommand_effectindexdump(float request)
 	}
 }
 
-void GameCommand_extendmatchtime(float request) // todo: Perhaps allows the user to send a specific time to extend it.
+void GameCommand_extendmatchtime(float request)
 {
 	switch(request)
 	{
@@ -1142,7 +776,7 @@ void GameCommand_find(float request, float argc)
 			return;
 			
 		default:
-			print("Incorrect parameters for \"find\"\n");
+			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");
@@ -1180,7 +814,7 @@ void GameCommand_gametype(float request, float argc)
 			return;
 			
 		default:
-			print("Incorrect parameters for \"gametype\"\n");
+			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");
@@ -1241,7 +875,7 @@ void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: fini
 			}
 			
 		default:
-			print("Incorrect parameters for \"gettaginfo\"\n");
+			print("Incorrect parameters for ^2gettaginfo^7\n");
 		case GC_REQUEST_USAGE:
 			print("\nUsage:^3 sv_cmd gettaginfo\n");
 			print("  FIXME: Arguments currently unknown\n");
@@ -1266,7 +900,7 @@ void GameCommand_gotomap(float request, float argc)
 			}
 			
 		default:
-			print("Incorrect parameters for \"gotomap\"\n");
+			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");
@@ -1371,11 +1005,13 @@ void GameCommand_modelbug(float request) // UNTESTED // is this even needed anym
 void GameCommand_moveplayer(float request, float argc)
 {
 	entity client;
-	string targets = argv(1);
+	
+	string targets = strreplace(",", " ", argv(1));
+	string original_targets = strreplace(" ", ", ", targets);
 	string destination = argv(2);
 	string notify = argv(3);
-	float i;
-	argc = tokenizebyseparator(targets, ","); // re-use argc for the targets
+	
+	string successful, t;
 	
 	switch(request)
 	{
@@ -1387,18 +1023,20 @@ void GameCommand_moveplayer(float request, float argc)
 			// 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;
 					}
 					
@@ -1409,12 +1047,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
 					{
@@ -1432,8 +1072,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
 								{
@@ -1448,44 +1088,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
 							{
@@ -1500,12 +1116,17 @@ void GameCommand_moveplayer(float request, float argc)
 						}
 					}
 				}
-				print("No acceptable players given, aborting.\n");
+				
+				if(successful)
+					print("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 \"moveplayer\"\n");
+			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");
@@ -1572,7 +1193,7 @@ void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this
 	}
 }
 
-void GameCommand_playerdemo(float request, float argc) // UNTESTED
+void GameCommand_playerdemo(float request, float argc) // UNTESTED // TODO: change the if statements for sub arguments to switches
 {
 	entity client;
 	float i, n, entno;
@@ -1638,9 +1259,9 @@ void GameCommand_playerdemo(float request, float argc) // UNTESTED
 			return;
 			
 		default:
+			print("Incorrect parameters for ^2radarmap^7\n");
 		case GC_REQUEST_USAGE:
 			print("\nUsage:^3 sv_cmd \n");
-			print("  No arguments required.\n");
 			print("  FIXME: Arguments currently unknown\n");
 			return;
 	}
@@ -1669,8 +1290,6 @@ void GameCommand_printstats(float request)
 
 void GameCommand_radarmap(float request, float argc)
 {
-	float i;
-	
 	switch(request)
 	{
 		case GC_REQUEST_HELP:
@@ -1678,51 +1297,11 @@ void GameCommand_radarmap(float request, float argc)
 			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": // allow minor alias
-						case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; }
-						case "--qual": // allow 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 \"radarmap\"\n");
+			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");
@@ -1776,7 +1355,7 @@ void GameCommand_records(float request)
 	}
 }
 
-void GameCommand_reducematchtime(float request) // todo: Perhaps allows the user to send a specific time to reduce it.
+void GameCommand_reducematchtime(float request)
 {
 	switch(request)
 	{
@@ -1797,31 +1376,385 @@ void GameCommand_reducematchtime(float request) // todo: Perhaps allows the user
 	}
 }
 
-void GameCommand(string command)
+void GameCommand_setbots(float request, float argc)
 {
-	// ===== TODO list =====
-	// test some of the older commands and if they're still wanted, fix them if they're broken.
+	switch(request)
+	{
+		case GC_REQUEST_HELP:
+			print("  ^2setbots^7: Change the values of bot_number and minplayers immediately to change the bot count\n");
+			return;
+			
+		case GC_REQUEST_COMMAND:
+			if(argc >= 3 && argv(1) == "setbots")
+			{
+				cvar_settemp("minplayers", "0");
+				cvar_settemp("bot_number", argv(2));
+				bot_fixcount();
+				return;
+			}
+			
+		default:
+		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_stuffto(float request, float argc)
+{
+	// This... is a fairly dangerous and powerful command... - It allows any arguments to be sent to a client via rcon.
+	// 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.
 	
-	// Finish adding the rest of the commands
+	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:
+			if(argc == 3)
+			{
+				entno = stof(argv(1));
+				client = world;
+				if(entno <= maxclients)
+					client = edict_num(entno);
+				if(client.flags & FL_CLIENT)
+				{
+					stuffcmd(client, strcat("\n", argv(2), "\n"));
+					print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
+				}
+				else
+					print(strcat("Client (", argv(1) ,") not found.\n"));
+				
+				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)
+	{
+		print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+		return;
+	}
+	#endif
+}
+
+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;
+	}
+}
+
+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");
+			print("hires = ", ftos(gettime(GETTIME_HIRES)), "\n");
+			print("uptime = ", ftos(gettime(GETTIME_UPTIME)), "\n");
+			print("localtime = ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"); // FIXME: Why is strftime broken? is engine problem, I think.
+			print("gmtime = ", strftime(FALSE, "%a %b %e %H:%M:%S %Z %Y"), "\n");
+			return;
+			
+		default:
+		case GC_REQUEST_USAGE:
+			print("\nUsage:^3 sv_cmd time\n");
+			print("  No arguments required.\n");
+			return;
+	}
+}
+
+void GameCommand_trace(float request, float argc)
+{
+	entity e;
+	vector org, delta, start, end, p, q, q0, pos, vv, dv;
+	float i, f, safe, unsafe, dq, dqf;
 	
-	// Add ifdef to stuffto so that is can only be used when the game code is compiled for it 
-	//(this way it's more obscure and harder to abuse on normal servers)
+	// 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:
+			switch(argv(1))
+			{
+				case "debug":
+					print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
+					for(;;)
+					{
+						org = world.mins;
+						delta = world.maxs - world.mins;
+
+						start_x = org_x + random() * delta_x;
+						start_y = org_y + random() * delta_y;
+						start_z = org_z + random() * delta_z;
+
+						end_x = org_x + random() * delta_x;
+						end_y = org_y + random() * delta_y;
+						end_z = org_z + random() * delta_z;
+
+						start = stov(vtos(start));
+						end = stov(vtos(end));
+
+						tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
+						if(!trace_startsolid)
+						{
+							p = trace_endpos;
+							tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world);
+							if(trace_startsolid || trace_fraction == 1)
+							{
+								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)
+								{
+									// how much do we need to back off?
+									safe = 1;
+									unsafe = 0;
+									for(;;)
+									{
+										pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
+										tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world);
+										if(trace_startsolid)
+										{
+											if((safe + unsafe) * 0.5 == unsafe)
+												break;
+											unsafe = (safe + unsafe) * 0.5;
+										}
+										else
+										{
+											if((safe + unsafe) * 0.5 == safe)
+												break;
+											safe = (safe + unsafe) * 0.5;
+										}
+									}
+
+									print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n");
+									print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n");
+
+									tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
+									if(trace_startsolid)
+										print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+									else
+										print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+									break;
+								}
+
+								q0 = p;
+								dq = 0;
+								dqf = 1;
+								for(;;)
+								{
+									q = p + normalize(end - p) * (dq + dqf);
+									if(q == q0)
+										break;
+									tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
+									if(trace_startsolid)
+										error("THIS ONE cannot happen");
+									if(trace_fraction > 0)
+										dq += dqf * trace_fraction;
+									dqf *= 0.5;
+									q0 = q;
+								}
+								if(dq > 0)
+								{
+									print("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+									print("could go ", ftos(dq), " units further to ", vtos(q), "\n");
+									break;
+								}
+							}
+						}
+					}
+					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;
+					if(trace_fraction == 1)
+					{
+						print("not above ground, aborting\n");
+						return;
+					}
+					f = 0;
+					for(i = 0; i < 100000; ++i)
+					{
+						dv = randomvec();
+						if(dv_z > 0)
+							dv = -1 * dv;
+						tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e);
+						if(trace_startsolid)
+							print("bug 1\n");
+						if(trace_fraction == 1)
+						if(dv_z < f)
+						{
+							print("bug 2: ", ftos(dv_x), " ", ftos(dv_y), " ", ftos(dv_z));
+							print(" (", ftos(asin(dv_z / vlen(dv)) * 180 / M_PI), " degrees)\n");
+							f = dv_z;
+						}
+					}
+					print("highest possible dist: ", ftos(f), "\n");
+					return;
+				
+				case "walk":
+					if(argc == 3)
+					{
+						e = nextent(world);
+						if(tracewalk(e, stov(argv(1)), e.mins, e.maxs, stov(argv(2)), MOVE_NORMAL))
+							print("can walk\n");
+						else
+							print("cannot walk\n");
+						return;
+					}
+						
+				case "showline":
+					if(argc == 3)
+					{
+						vv = stov(argv(1));
+						dv = stov(argv(2));
+						traceline(vv, dv, MOVE_NORMAL, world);
+						trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), vv, trace_endpos);
+						trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv);
+						return;
+					}
+					
+				// no default case, just go straight to "invalid arguments"
+			}
+			
+		default:
+		case GC_REQUEST_USAGE:
+			print("\nUsage:^3 sv_cmd trace command [arguments]\n");
+			print("  FIXME: Arguments currently unknown\n");
+			return;
+	}
+}
+
+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");
+			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;
+	}
+}
+
+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)));
+					print("Successfully warped to campaign level ", stof(argv(1)), ".\n");
+				}	
+				else
+				{
+					CampaignLevelWarp(-1);
+					print("Successfully warped to next campaign level.\n");
+				}
+			}
+			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;
+	}
+}
+
+
+// =========================================
+//  Main Function Called By Engine (sv_cmd)
+// =========================================
+// If this function exists, game code handles gamecommand instead of the engine code.
+
+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(argv(0) == "help") 
+	if(strtolower(argv(0)) == "help") 
 	{
 		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);
+			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);
+			GameCommand_cointoss(GC_REQUEST_HELP, 0);
 			GameCommand_cvar_changes(GC_REQUEST_HELP);
 			GameCommand_cvar_purechanges(GC_REQUEST_HELP);
 			GameCommand_database(GC_REQUEST_HELP, 0);
@@ -1847,6 +1780,13 @@ void GameCommand(string command)
 			GameCommand_rankings(GC_REQUEST_HELP);
 			GameCommand_records(GC_REQUEST_HELP);
 			GameCommand_reducematchtime(GC_REQUEST_HELP);
+			GameCommand_setbots(GC_REQUEST_HELP, 0);
+			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_Ban("help");
 			GameCommand_Generic("help");
@@ -1871,15 +1811,18 @@ void GameCommand(string command)
 	else
 		search_request_type = GC_REQUEST_COMMAND; // continue as usual and scan for normal commands
 		
-	switch( ((argv(0) == "help") ? argv(1) : argv(0)) ) // if first argument is help, then search for the second argument. Else, search for first. 
+	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. 
 	{
+		// 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); 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); 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;
@@ -1905,9 +1848,15 @@ void GameCommand(string command)
 		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 "setbots": GameCommand_setbots(search_request_type, argc); 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");
 	}
-}
-
+}
\ No newline at end of file