return TRUE;
}
- // spawn a new object
+ // spawn a new object with default properties
entity e;
e = spawn();
- e.owner = self;
+ 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_BBOX;
+ 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_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
if(autocvar_g_sandbox_info)
print(strcat(self.netname, " spawned an object at origin ", vtos(e.origin), "\n"));
-dprint(strcat(vtos(e.absmin), " - ", vtos(e.absmax), "\n"));
-
return TRUE;
}
else if(argv(1) == "spawn_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_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)
{
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);
- if(trace_ent.classname == "object")
+ 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"));
return TRUE;
}
-dprint(strcat(trace_ent.classname, "\n"));
-te_lightning2(world, self.origin + self.view_ofs + v_forward * 5 - v_up * 5, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit);
-
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;
}