From 98d544b459b1a618ef2d913a35ff8ab8a584c7c2 Mon Sep 17 00:00:00 2001
From: MIDIManNoah <59802822+MIDIManNoah@users.noreply.github.com>
Date: Fri, 23 Dec 2022 22:19:09 -0500
Subject: [PATCH] Make some fixes for Metal Sonic's boss fight
---
src/info.c | 8 ++++----
src/p_mobj.c | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/info.c b/src/info.c
index c4c1970273..174eb5cc44 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1758,14 +1758,14 @@ state_t states[NUMSTATES] =
// Metal Sonic
{SPR_PLAY, SPR2_STND, -1, {NULL}, 0, 0, S_METALSONIC_RACE}, // S_METALSONIC_RACE
- {SPR_METL, 4, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_FLOAT
+ {SPR_METL, 4, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_FLOAT
{SPR_METL, 16|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_METALSONIC_STUN}, // S_METALSONIC_VECTOR
{SPR_METL, 15, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_STUN
{SPR_METL, 17, 20, {NULL}, 0, 0, S_METALSONIC_GATHER},// S_METALSONIC_RAISE
- {SPR_METL, 18, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_GATHER
+ {SPR_METL, 18, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_GATHER
{SPR_METL, 6|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_BOUNCE},// S_METALSONIC_DASH
- {SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_NULL}, // S_METALSONIC_BOUNCE
- {SPR_METL, 14, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_BADBOUNCE
+ {SPR_METL, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 1, 2, S_METALSONIC_FLOAT}, // S_METALSONIC_BOUNCE
+ {SPR_METL, 14, -1, {NULL}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_BADBOUNCE
{SPR_METL, 17, -1, {NULL}, 0, 0, S_METALSONIC_GATHER},// S_METALSONIC_SHOOT
{SPR_METL, 15, 40, {A_Pain}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_PAIN
{SPR_METL, 17, 2, {A_Fall}, 0, 0, S_METALSONIC_DEATH2},// S_METALSONIC_DEATH1
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 49c438b3f9..e1657c12f6 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -5664,6 +5664,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
{
mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER);
missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy));
+ if (missile->fuse <= 0) // Prevents a division by zero when calculating missile->scalespeed
+ missile->fuse = 1;
if (missile->fuse > mobj->fuse)
P_RemoveMobj(missile);
--
GitLab