X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=28017401af9033b3bf5d24f813f7870699d041de;hp=1e66c9d26d9d98642d73b2d8ec87391a7a7af6bf;hb=a86fa5a48ac75276db3da34fd3721678517c62fa;hpb=7bee7eba4d16dc0e3e6b3507ab85e3a3de905e60

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 1e66c9d26d..28017401af 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -13,41 +13,123 @@ 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)
 			{
-				// don't allow spawning objects without a model
-				print_to(self, "WARNING: Attempted to spawn an object without a model. Please specify the path to your mesh 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)))
+			{
+				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 with default properties
 			entity e;
 			e = spawn();
+			e.realowner = self;
 			e.classname = "object";
+			e.takedamage = DAMAGE_NO;
+			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 * autocvar_g_sandbox_editor_distance, 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, argv(2));
-			e.angles = self.v_angle; // give the player's angles to the object, as he spawns it from behind
+			e.angles_y = self.v_angle_y; // apply the player's direction to the object, as he spawns it from behind
 
 			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" && trace_ent.realowner == self)
+			{
+				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 FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(sandbox_PlayerPreThink)
+{
+	// if the player is close enough to their own object and facing it, they can grab it
+
+	if(autocvar_sv_cheats)
+		return FALSE; // cheat dragging is used instead
+
+	float grab;
+	crosshair_trace_plusvisibletriggers(self);
+
+	// grab is TRUE if the object can be picked up. While an object is being carried, the Drag() function
+	// must execute for it either way, otherwise it would cause bugs if it went out of the player's trace.
+	// This also makes sure that an object can only pe picked up if in range, but does not get dropped if it goes
+	// out of range while slinging it around.
+
+	if(trace_ent.classname == "object" && trace_ent.realowner == self && vlen(trace_ent.origin - self.origin) <= autocvar_g_sandbox_editor_distance_edit)
+		grab = TRUE; // object can be picked up
+	if(Drag(trace_ent, grab)) // execute dragging
+		if(autocvar_g_sandbox_info)
+			print(strcat(self.netname, " grabbed an object at origin ", vtos(trace_ent.origin), "\n"));
+
+	return FALSE;
+}
+
 MUTATOR_DEFINITION(sandbox)
 {
 	MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY);
+	MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY);
 
 	return 0;
 }