Merge remote-tracking branch 'upstream/master' into spawnflags

This commit is contained in:
BjossiAlfreds 2019-09-23 16:42:09 +00:00
commit 2eaf15ccf0

View file

@ -640,8 +640,12 @@ 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 + rand() % 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 + rand() % 6, -10, DAMAGE_ENERGY, MOD_UNKNOWN);
}
}
void