Fix a potential crash in ai_run_melee() and ai_run_missile().

This was found and fixed by Maraakate.
This commit is contained in:
Yamagi Burmeister 2017-09-07 18:12:41 +02:00
parent 6f1b2f101f
commit 5447354a76

View file

@ -809,11 +809,14 @@ ai_run_melee(edict_t *self)
M_ChangeYaw(self); M_ChangeYaw(self);
if (FacingIdeal(self)) if (FacingIdeal(self))
{
if (self->monsterinfo.melee)
{ {
self->monsterinfo.melee(self); self->monsterinfo.melee(self);
self->monsterinfo.attack_state = AS_STRAIGHT; self->monsterinfo.attack_state = AS_STRAIGHT;
} }
} }
}
/* /*
* Turn in place until within an * Turn in place until within an
@ -826,11 +829,14 @@ ai_run_missile(edict_t *self)
M_ChangeYaw(self); M_ChangeYaw(self);
if (FacingIdeal(self)) if (FacingIdeal(self))
{
if (self->monsterinfo.attack)
{ {
self->monsterinfo.attack(self); self->monsterinfo.attack(self);
self->monsterinfo.attack_state = AS_STRAIGHT; self->monsterinfo.attack_state = AS_STRAIGHT;
} }
} }
}
/* /*
* Strafe sideways, but stay at * Strafe sideways, but stay at