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

SERVER: Fix Zombies dropping Power-Ups when killed via Trap

Browse source
This commit is contained in:
cypress 2023-08-28 11:07:07 -04:00
parent 901ee7121e
commit 126298114c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/server/ai/zombie_core.qc
View file

@ -1149,7 +1149,7 @@ void() Zombie_Death =
self.s_time = 0; self.s_time = 0;
} }
if(self.outside == FALSE) if(self.outside == false && self.electro_targeted == false)
{ {
if (totalpowerups < POWERUPS_PER_ROUND) if (totalpowerups < POWERUPS_PER_ROUND)
{ {

1
source/server/entities/traps.qc
View file

@ -94,6 +94,7 @@ void() zapper_do_damage
// - Has a chance to gib. // - Has a chance to gib.
// - No normal death sound, play elec sound on contact, then // - No normal death sound, play elec sound on contact, then
// again on death. // again on death.
// - Zombies do not drop Power-Ups when killed via traps.
if (other.classname == "ai_zombie_head" || other.classname == "ai_zombie_rarm" if (other.classname == "ai_zombie_head" || other.classname == "ai_zombie_rarm"
|| other.classname == "ai_zombie_larm") { || other.classname == "ai_zombie_larm") {
// If we're a limb, grab our body. // If we're a limb, grab our body.