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

Fix crash with some projectiles generating sound targets.

Browse source 
Some projectiles like grenades or rockets are classified as enemies.
Their explosion spawn a sound entity, monsters should move to that. But
the projectile is destroyed when exploding, it's entity struct is set to
NULL. Therefor the self->enemy pointer is also NULL. The self->enemy
check was removed in bc5f5698. Work around this by pretending that the
enemy is already there.

This was reported by @Soldy, closes yquake2/xatrix#56.
This commit is contained in:
Yamagi 2020-06-04 08:12:36 +02:00
parent 57f7ce86e8
commit ea0c0c04a2
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/game/g_ai.c
View file

@ -1141,13 +1141,23 @@ ai_run(edict_t *self, float dist)
if (self->monsterinfo.aiflags & AI_SOUND_TARGET)
{
VectorSubtract(self->s.origin, self->enemy->s.origin, v);
if (VectorLength(v) < 64)
/* Special case: Some projectiles like grenades or rockets are
classified as an enemy. When they explode they generate a
sound entity, triggering this code path. Since they're gone
after the explosion their entity pointer is NULL. Therefor
self->enemy is also NULL and we're crashing. Work around
this by predending that the enemy is still there, and move
to it. */
if (self->enemy)
{
self->monsterinfo.aiflags |= (AI_STAND_GROUND | AI_TEMP_STAND_GROUND);
self->monsterinfo.stand(self);
return;
VectorSubtract(self->s.origin, self->enemy->s.origin, v);
if (VectorLength(v) < 64)
{
self->monsterinfo.aiflags |= (AI_STAND_GROUND | AI_TEMP_STAND_GROUND);
self->monsterinfo.stand(self);
return;
}
}
M_MoveToGoal(self, dist);