From 8dafc82cbdcac2181da640a8c25e21128dc45b81 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 29 Jan 2012 19:04:30 +0200 Subject: [PATCH] Don't attempt to assign some values to the world when shooting it --- data/qcsrc/server/g_damage.qc | 2 +- data/qcsrc/server/w_grabber.qc | 8 +++++--- docs/TODO.txt | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 65e2c092..a628a892 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -863,7 +863,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // lean the player based on the amount of damage taken if(cvar("g_leanplayer_damage")) - if(WEP_VALID(DEATH_WEAPONOF(deathtype))) // only for damage caused by weapons + if(targ.classname == "player" && WEP_VALID(DEATH_WEAPONOF(deathtype))) // only for damage caused by weapons { targ.leanangle_damage_loc = hitloc - targ.origin; targ.leanangle_damage_force += force * cvar("g_leanplayer_damage"); // keep existing force if any diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index dee920e4..6f50fb38 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -45,12 +45,14 @@ void W_Grabber_Attack2() if(trace_fraction < 1) // should always be true, but just in case { Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir); - trace_ent.armorvalue = bound(0, trace_ent.armorvalue - cvar("g_balance_grabber_secondary_armordamage"), cvar("g_balance_armor_limit")); - trace_ent.grabber_stunned = time + cvar("g_balance_grabber_secondary_stun_maxtime") * random(); - pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1); + if(trace_ent.classname == "player") + { + trace_ent.armorvalue = bound(0, trace_ent.armorvalue - cvar("g_balance_grabber_secondary_armordamage"), cvar("g_balance_armor_limit")); + trace_ent.grabber_stunned = time + cvar("g_balance_grabber_secondary_stun_maxtime") * random(); sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM); + } else { sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_world.wav", VOL_BASE, ATTN_NORM); diff --git a/docs/TODO.txt b/docs/TODO.txt index 3432e10f..1fa8f0af 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -108,13 +108,11 @@ - 0.7: Rearrange player colors and make them the same as in Xonotic. -- 0.7 BUG: Fix the world reporting leanangle again when shooting it - - 0.7 | 0.8: Add cubemap reflections for eX and trak5 - 0.7 | 0.8: Maybe find better footstep sounds? -- 0.7 | 0.8 BUG: Gibbed dead bodies seem to keep throwing gibs infinitely on dedicated servers. +- 0.7 | 0.8 BUG: Gibbed dead bodies seem to keep throwing gibs infinitely sometimes. - 0.8: Chat portraits for all models. -- 2.39.2