X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_weapons.qc;h=f908a519440b4ae327fa62df9a8ada469f23d0dd;hb=8e9b77f4630d1ae72de5f324b9a232f426651193;hp=cd5b1da2efa92ccecfd52c5c01f81bb9fa5d3e86;hpb=5e818911630219eca7debc88037e393719ed015d;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index cd5b1da2..f908a519 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -202,6 +202,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto if(startitem_failed) return string_null; wep.colormod = wep.owner.colormod; // used by the regurgitating colors + wep.glowmod = own.weaponentity_glowmod; wep.think = thrown_wep_think; wep.nextthink = time + 0.5; return ""; @@ -238,6 +239,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto s = substring(s, 5, -1); } wep.colormod = wep.owner.colormod; // used by the regurgitating colors + wep.glowmod = own.weaponentity_glowmod; wep.think = thrown_wep_think; wep.nextthink = time + 0.5; return s; @@ -274,7 +276,7 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce) w = self.weapon; if (w == 0) return; // just in case - if(self.predator.classname == "player" && self.dropweapon_check) + if(self.stat_eaten && self.dropweapon_check) return; // can't drop weapons from the stomach if (g_lms) return;