X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=ea41dcea3b7b092d737256b85028b8ae8b66ca7c;hp=747494d42ef6d8d540882ada7e3c26d60b99062f;hb=a4507f589e7a11838a63576e69b5789cb97d6815;hpb=0cb0cce8f5f342a1c41b61a0753c78653a2184c2

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 747494d42..ea41dcea3 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -31,20 +31,17 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				return TRUE;
 			}
 
-			// spawn a new object
+			// spawn a new object with default properties
 			entity e;
 			e = spawn();
-
-			//e.owner = self; // for some reason, setting this causes collisions to break
+			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 * autocvar_g_sandbox_editor_distance_spawn, MOVE_NORMAL, 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_y = self.v_angle_y; // apply the player's direction to the object, as he spawns it from behind
@@ -68,7 +65,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 			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_spawn, MOVE_NOMONSTERS, self);
+			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)
 			{
@@ -88,7 +85,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 		else if(argv(1) == "remove_object")
 		{
 			makevectors(self.v_angle);
-			traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self);
+			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)
@@ -105,9 +102,29 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 	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; // cheats already allow dragging all objects
+
+	crosshair_trace_plusvisibletriggers(self);
+
+	float candrag;
+	if(trace_ent.classname == "object" && vlen(trace_ent.origin - self.origin) <= autocvar_g_sandbox_editor_distance_edit)
+		candrag = TRUE; // object can be picked up
+	if(Drag(trace_ent, candrag)) // 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;
 }