More documentation and some minor changes for drag code

[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 257d752b734cd9139bdd4f59848267079f2884f7..28017401af9033b3bf5d24f813f7870699d041de 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -31,21 +31,20 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                return TRUE;
                        }
 
                                return TRUE;
                        }
 

-                       // spawn a new object with the default settings
+                       // spawn a new object with default properties

                        entity e;
                        e = spawn();
                        entity e;
                        e = spawn();

+                       e.realowner = self;

                        e.classname = "object";
                        e.takedamage = DAMAGE_NO;
                        e.classname = "object";
                        e.takedamage = DAMAGE_NO;

-
-                       // those properties are defaults that can be edited later

                        e.movetype = MOVETYPE_TOSS;
                        e.movetype = MOVETYPE_TOSS;

-                       e.solid = SOLID_TRIGGER;
+                       e.solid = SOLID_BSP;

 
                        makevectors(self.v_angle);
 
                        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));
                        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"));
 
                        if(autocvar_g_sandbox_info)
                                print(strcat(self.netname, " spawned an object at origin ", vtos(e.origin), "\n"));


@@ -54,7 +53,6 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                }
                else if(argv(1) == "spawn_item")
                {
                }
                else if(argv(1) == "spawn_item")
                {

-                       // spawn a new item

                        // weapons are the only items currently supported
 
                        if(cmd_argc < 3)
                        // weapons are the only items currently supported
 
                        if(cmd_argc < 3)


@@ -63,10 +61,11 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                return TRUE;
                        }
 
                                return TRUE;
                        }
 

+                       // spawn a new item

                        entity e;
                        float i;
                        makevectors(self.v_angle);
                        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)
                        {
 
                        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
                        {


@@ -83,13 +82,54 @@ 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;
                }
                        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;
 }
 
        }
        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_DEFINITION(sandbox)
 {
        MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY);

+       MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY);

 
        return 0;
 }
 
        return 0;
 }