Merge branch 'metal-sigfpe' into 'next'

Fix a division by zero in BCZ2 Metal Sonic's routine

See merge request STJr/SRB2!1283
This commit is contained in:
James R 2020-12-10 15:35:03 -05:00
commit e46c6e75f3
1 changed files with 2 additions and 6 deletions

View File

@ -5654,14 +5654,10 @@ static void P_Boss9Thinker(mobj_t *mobj)
if (P_RandomRange(1,(dist>>FRACBITS)/16) == 1) if (P_RandomRange(1,(dist>>FRACBITS)/16) == 1)
break; break;
} }
if (spawner) if (spawner && dist)
{ {
mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER); mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER);
missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy));
if (dist == 0)
missile->fuse = 0;
else
missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy));
if (missile->fuse > mobj->fuse) if (missile->fuse > mobj->fuse)
P_RemoveMobj(missile); P_RemoveMobj(missile);