nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-22 03:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Fix Melee registration when targeting Zombie Limb

Browse source
This commit is contained in:
cypress 2024-05-16 20:02:14 -07:00
parent 7c344306c3
commit 090e483292
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/server/weapons/weapon_core.qc
View file

@ -1184,6 +1184,10 @@ void() WeaponCore_Melee =
vector trace_source = self.origin + self.view_ofs; vector trace_source = self.origin + self.view_ofs;
traceline(trace_source, trace_source + v_forward * melee_range, 0, self); traceline(trace_source, trace_source + v_forward * melee_range, 0, self);
// Check if this is a Zombie limb, set to the body if so
if (trace_ent.owner.head == trace_ent || trace_ent.owner.larm == trace_ent || trace_ent.owner.rarm == trace_ent)
trace_ent = trace_ent.owner;
// Target does not take damage -- no need to go any further // Target does not take damage -- no need to go any further
if (!trace_ent.takedamage && !(trace_ent.flags & FL_CLIENT)) { if (!trace_ent.takedamage && !(trace_ent.flags & FL_CLIENT)) {
// Hit a solid surface, so play hard melee sound. // Hit a solid surface, so play hard melee sound.
@ -1195,10 +1199,6 @@ void() WeaponCore_Melee =
} else { } else {
// AI has a more involved routine than other entities // AI has a more involved routine than other entities
if (trace_ent.aistatus == "1") { if (trace_ent.aistatus == "1") {
// Check if this is a Zombie limb, set to the body if so
if (trace_ent.owner.head == trace_ent || trace_ent.owner.larm == trace_ent || trace_ent.owner.rarm == trace_ent)
trace_ent = trace_ent.owner;
// Play a flesh-y impact sound, spawn blood. // Play a flesh-y impact sound, spawn blood.
sound (self, CHAN_WEAPON, "sounds/weapons/knife/knife_hitbod.wav", 1, ATTN_NORM); sound (self, CHAN_WEAPON, "sounds/weapons/knife/knife_hitbod.wav", 1, ATTN_NORM);
SpawnBlood(trace_source + (v_forward * 20), trace_source + (v_forward * 20), 50); SpawnBlood(trace_source + (v_forward * 20), trace_source + (v_forward * 20), 50);