yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 15:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix floater melee / zap damage getting applied if enemy is out of range.

Browse source 
Found by @BjossiAlfreds, closes #454.
This commit is contained in:
Yamagi Burmeister 2019-09-23 17:32:43 +02:00
parent a942ca4bba
commit 0286cdcd0b
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/monster/float/float.c
View file

@ -665,9 +665,13 @@ floater_zap(edict_t *self)
gi.WriteByte(1); /* sparks */
gi.multicast(origin, MULTICAST_PVS);
T_Damage(self->enemy, self, self, dir, self->enemy->s.origin,
vec3_origin, 5 + randk() % 6, -10, DAMAGE_ENERGY,
MOD_UNKNOWN);
if (range(self, self->enemy) && infront(self, self->enemy) &&
visible(self, self->enemy))
{
T_Damage(self->enemy, self, self, dir, self->enemy->s.origin,
vec3_origin, 5 + randk() % 6, -10, DAMAGE_ENERGY,
MOD_UNKNOWN);
}
}
void