Use a different way to check distance and dragging requirements. This fixes a bug...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / sandbox.qc

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 7d443bfb6b0603500fd6d3b7d618c4ac96e7946b..ea41dcea3b7b092d737256b85028b8ae8b66ca7c 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -31,18 +31,17 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                return TRUE;
                        }
 
-                       // spawn a new object with the default settings
+                       // spawn a new object with default properties
                        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_TRIGGER;
+                       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_y = self.v_angle_y; // apply the player's direction to the object, as he spawns it from behind
@@ -54,7 +53,6 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                }
                else if(argv(1) == "spawn_item")
                {
-                       // spawn a new item
                        // weapons are the only items currently supported
 
                        if(cmd_argc < 3)
@@ -63,10 +61,11 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                return TRUE;
                        }
 
+                       // spawn a new item
                        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);
+                       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)
                        {
@@ -83,13 +82,49 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                        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 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;
 }