X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=5f6c5b7f819699153809dccd57d0ed5ae6b61f9b;hb=7be12ebd403babcf93aa220868b7680039cbcb60;hp=7dada9f1c0f2673aeb4a321d9803d4da6914cf9d;hpb=d817905c07fcbd588ad715e32da20367c31b099b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 7dada9f1c..5f6c5b7f8 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -13,17 +13,18 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 		if(argv(1) == "help")
 		{
 			print_to(self, "You can use the following sandbox commands:");
-			print_to(self, "^7\"^2spawn ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model");
+			print_to(self, "^7\"^2spawn_object ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model");
+			print_to(self, "^7\"^2spawn_item ^3item^7\" spawns the specified item in front of the player. Only weapons are currently supported");
 			return TRUE;
 		}
-		else if(argv(1) == "spawn")
+		else if(argv(1) == "spawn_object")
 		{
 			// spawn a new object with the default settings
 
 			// don't allow spawning objects without a model
 			if(cmd_argc < 3)
 			{
-				print_to(self, "WARNING: Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'spawn' command");
+				print_to(self, "WARNING: Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'spawn_object' command");
 				return TRUE;
 			}
 			else if not(fexists(argv(2)))
@@ -35,6 +36,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 			entity e;
 			e = spawn();
 			e.classname = "object";
+
 			makevectors(self.v_angle);
 			traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance, MOVE_NOMONSTERS, self);
 			setorigin(e, trace_endpos);
@@ -46,6 +48,37 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 
 			return TRUE;
 		}
+		else if(argv(1) == "spawn_item")
+		{
+			// spawn a new item
+			// weapons are the only items currently supported
+
+			if(cmd_argc < 3)
+			{
+				print_to(self, "WARNING: Attempted to spawn an item without specifying its type. Please specify the name of your item after the 'spawn_item' command");
+				return TRUE;
+			}
+
+			entity e;
+			float i;
+			makevectors(self.v_angle);
+			traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance, MOVE_NOMONSTERS, self);
+
+			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+			{
+				e = get_weaponinfo(i);
+				if(e.netname == argv(2))
+				{
+					W_ThrowNewWeapon(self, i, FALSE, trace_endpos, '0 0 0');
+					if(autocvar_g_sandbox_info)
+						print(strcat(self.netname, " spawned a ^2", e.netname, "^7 at origin ", vtos(e.origin), "\n"));
+					return TRUE;
+				}
+			}
+
+			print_to(self, "WARNING: Attempted to spawn an invalid or unsupported item. See 'g_sandbox help' for supported items");
+			return TRUE;
+		}
 	}
 	return FALSE;
 }