From a93dcc6f88a07b8c1e148516e8d0a86959026bcf Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Wed, 4 Apr 2012 17:08:21 +0300 Subject: [PATCH] Make ghost items return to their original spawning point after being shot --- .../mutators/mutator_physical_weapons.qc | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/mutator_physical_weapons.qc b/qcsrc/server/mutators/mutator_physical_weapons.qc index 440135996a..3fb5743dbe 100644 --- a/qcsrc/server/mutators/mutator_physical_weapons.qc +++ b/qcsrc/server/mutators/mutator_physical_weapons.qc @@ -1,3 +1,5 @@ +.vector spawn_origin, spawn_angles; + void thrown_wep_ode_think() { self.nextthink = time; @@ -10,6 +12,20 @@ void thrown_wep_ode_think() self.colormap = self.owner.colormap; self.colormod = self.owner.colormod; self.glowmod = self.owner.glowmod; + + // if the item is not spawned, make sure the invisible / ghost item returns to its origin and stays there + if(self.owner.nextthink > time) // awaiting respawn + { + setorigin(self, self.spawn_origin); + self.angles = self.owner.angles; + self.solid = SOLID_NOT; + self.movetype = MOVETYPE_NONE; + } + else + { + self.solid = SOLID_CORPSE; + self.movetype = MOVETYPE_PHYSICS; + } } if(!self.owner.modelindex) @@ -18,11 +34,8 @@ void thrown_wep_ode_think() MUTATOR_HOOKFUNCTION(item_spawning) { - if(self.classname != "droppedweapon") - { - if(autocvar_g_ode_items <= 1) - return FALSE; - } + if(self.classname != "droppedweapon" && autocvar_g_ode_items <= 1) + return FALSE; // The actual item can't be physical and trigger at the same time, so make it invisible and use a second entity for physics. // Ugly hack, but unless SOLID_TRIGGER is gotten to work with MOVETYPE_PHYSICS in the engine it can't be fixed. @@ -47,6 +60,9 @@ MUTATOR_HOOKFUNCTION(item_spawning) wep.nextthink = time; wep.cnt = (self.classname == "droppedweapon"); + wep.spawn_origin = self.origin; + wep.spawn_angles = self.angles; + self.effects |= EF_NODRAW; // hide the original weapon self.movetype = MOVETYPE_FOLLOW; self.aiment = wep; // attach the original weapon -- 2.39.2