X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=7b929ecd841a41bfa4094fad5440ebb51a10ab8b;hb=c770e6d6105864baacf6c7d35ab106cdbed6e1ac;hp=0e20901ace6e96260429600c9a3d4e7de8887cc1;hpb=825b472d88a8762141caf83601191b55e7a11f75;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 0e20901ac..7b929ecd8 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,35 +1,108 @@
 MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 {
 	if(MUTATOR_RETURNVALUE) // command was already handled?
-		return 0;
+		return FALSE;
 	if(cmd_name == "g_sandbox")
 	{
 		if(cmd_argc < 2)
 		{
 			print_to(self, "Sandbox mode is active. For more information, use 'g_sandbox help'");
-			return 1;
+			return TRUE;
 		}
 
 		if(argv(1) == "help")
 		{
 			print_to(self, "You can use the following sandbox commands:");
-			return 1;
+			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_object' command");
+				return TRUE;
+			}
+			else if not(fexists(argv(2)))
+			{
+				print_to(self, "WARNING: Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct");
+				return TRUE;
+			}
 
+			// spawn a new object
 			entity e;
 			e = spawn();
+
+			e.realowner = self;
+			e.classname = "object";
+			e.takedamage = DAMAGE_NO;
+
+			// those properties are defaults that can be edited later
+			e.movetype = MOVETYPE_TOSS;
+			e.solid = SOLID_BSP;
+
 			makevectors(self.v_angle);
-			traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 250, MOVE_NOMONSTERS, self);
+			WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_spawn, MOVE_NORMAL, self);
 			setorigin(e, trace_endpos);
-			setmodel(e, "models/vehicles-static/raptor.md3");
+			setmodel(e, argv(2));
+			e.angles_y = self.v_angle_y; // apply the player's direction to the object, as he spawns it from behind
 
-			return 1;
+			if(autocvar_g_sandbox_info)
+				print(strcat(self.netname, " spawned an object at origin ", vtos(e.origin), "\n"));
+
+			return TRUE;
+		}
+		else if(argv(1) == "spawn_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;
+			}
+
+			// spawn a new item
+			entity e;
+			float i;
+			makevectors(self.v_angle);
+			WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_spawn, 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;
+		}
+		else if(argv(1) == "remove_object")
+		{
+			makevectors(self.v_angle);
+			WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self);
+			if(trace_ent.classname == "object")
+			{
+				if(autocvar_g_sandbox_info)
+					print(strcat(self.netname, " removed an object at origin ", vtos(trace_ent.origin), "\n"));
+				remove(trace_ent);
+				trace_ent = world;
+				return TRUE;
+			}
+
+			print_to(self, "WARNING: Object could not be removed. Make sure you are facing an object that you have spawned");
+			return TRUE;
 		}
 	}
-	return 0;
+	return FALSE;
 }
 
 MUTATOR_DEFINITION(sandbox)