From 6d217b8fd63f56e08e83ab6e11a630e1c5639ed5 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 27 Mar 2024 18:17:14 -0700 Subject: [PATCH] Fix Sealed Star Mace hardcode - Was broken and didn't have a hitbox or sprite - Didn't notice because there was a SOC file taking precedence --- src/deh_tables.c | 3 +++ src/info.c | 18 +++++++++++------- src/info.h | 4 ++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 56141c56e..581f8c23d 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -3011,6 +3011,9 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi // MT_SSCHAINSOUND "S_SSCHAINSOUND", + // MT_SLSTMACE + "S_SLSTMACE", + // MT_SEALEDSTAR_BUMPER "S_SEALEDSTAR_BUMPER", "S_SEALEDSTAR_BUMPERHIT", diff --git a/src/info.c b/src/info.c index d87c3b209..df1e76e57 100644 --- a/src/info.c +++ b/src/info.c @@ -741,6 +741,7 @@ char sprnames[NUMSPRITES + 1][5] = "SENB", "SENC", "SEAS", + "S_SP", // Tutorial "TLKP", // Talk Point @@ -3534,6 +3535,9 @@ state_t states[NUMSTATES] = // MT_SSCHAINSOUND {SPR_NULL, 0, 16, {A_PlaySound}, sfx_ssthnk, 1, S_SSCHAINSOUND}, // S_SSCHAINSOUND + // MT_SLSTMACE + {SPR_S_SP, FF_ANIMATE|FF_SEMIBRIGHT, -1, {NULL}, 3, 2, S_NULL}, // S_SLSTMACE + // MT_SEALEDSTAR_BUMPER {SPR_SBMP, 0|FF_FULLBRIGHT, -1, {NULL}, 2, 8, S_SEALEDSTAR_BUMPER}, // S_SEALEDSTAR_BUMPER {SPR_SBMP, 1|FF_ANIMATE|FF_FULLBRIGHT, 8, {NULL}, 1, 2, S_SEALEDSTAR_BUMPER}, // S_SEALEDSTAR_BUMPERHIT @@ -21753,9 +21757,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, { // MT_SLSTMACE - -1, // doomednum - S_INVISIBLE, // spawnstate - 1, // spawnhealth + -1, // doomednum + S_SLSTMACE, // spawnstate + 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound 0, // reactiontime @@ -21769,13 +21773,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 1*FRACUNIT, // radius - 1*FRACUNIT, // height + 40*FRACUNIT, // radius + 96*FRACUNIT, // height 0, // dispoffset - 0, // mass + DMG_WIPEOUT, // mass 0, // damage sfx_None, // activesound - 0, // flags + MF_PAIN|MF_NOHITLAGFORME, // flags S_NULL // raisestate }, { // MT_SEALEDSTAR_BUMPER diff --git a/src/info.h b/src/info.h index a6f13804c..9ce16346f 100644 --- a/src/info.h +++ b/src/info.h @@ -1276,6 +1276,7 @@ typedef enum sprite SPR_SENB, // Cabotron SPR_SENC, // Cabotron SPR_SEAS, // Starstream + SPR_S_SP, // Mace // Tutorial SPR_TLKP, // Talk Point @@ -4018,6 +4019,9 @@ typedef enum state // MT_SSCHAINSOUND S_SSCHAINSOUND, + // MT_SLSTMACE + S_SLSTMACE, + // MT_SEALEDSTAR_BUMPER S_SEALEDSTAR_BUMPER, S_SEALEDSTAR_BUMPERHIT,