thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-sealed-mace' into 'master'

Browse source 
Fix Sealed Star Mace hardcode

Closes #1012

See merge request KartKrew/Kart!2182
This commit is contained in:
Gunla 2024-03-28 02:17:26 +00:00
commit 1cdb2be7aa
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/deh_tables.c
View file

@ -3011,6 +3011,9 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
// MT_SSCHAINSOUND // MT_SSCHAINSOUND
"S_SSCHAINSOUND", "S_SSCHAINSOUND",
// MT_SLSTMACE
"S_SLSTMACE",
// MT_SEALEDSTAR_BUMPER // MT_SEALEDSTAR_BUMPER
"S_SEALEDSTAR_BUMPER", "S_SEALEDSTAR_BUMPER",
"S_SEALEDSTAR_BUMPERHIT", "S_SEALEDSTAR_BUMPERHIT",

16
src/info.c
View file

@ -741,6 +741,7 @@ char sprnames[NUMSPRITES + 1][5] =
"SENB", "SENB",
"SENC", "SENC",
"SEAS", "SEAS",
"S_SP",
// Tutorial // Tutorial
"TLKP", // Talk Point "TLKP", // Talk Point
@ -3534,6 +3535,9 @@ state_t states[NUMSTATES] =
// MT_SSCHAINSOUND // MT_SSCHAINSOUND
{SPR_NULL, 0, 16, {A_PlaySound}, sfx_ssthnk, 1, S_SSCHAINSOUND}, // S_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 // MT_SEALEDSTAR_BUMPER
{SPR_SBMP, 0|FF_FULLBRIGHT, -1, {NULL}, 2, 8, S_SEALEDSTAR_BUMPER}, // S_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 {SPR_SBMP, 1|FF_ANIMATE|FF_FULLBRIGHT, 8, {NULL}, 1, 2, S_SEALEDSTAR_BUMPER}, // S_SEALEDSTAR_BUMPERHIT
@ -21754,8 +21758,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
}, },
{ // MT_SLSTMACE { // MT_SLSTMACE
-1, // doomednum -1, // doomednum
S_INVISIBLE, // spawnstate S_SLSTMACE, // spawnstate
1, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound
0, // reactiontime 0, // reactiontime
@ -21769,13 +21773,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
1*FRACUNIT, // radius 40*FRACUNIT, // radius
1*FRACUNIT, // height 96*FRACUNIT, // height
0, // dispoffset 0, // dispoffset
0, // mass DMG_WIPEOUT, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
0, // flags MF_PAIN|MF_NOHITLAGFORME, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_SEALEDSTAR_BUMPER { // MT_SEALEDSTAR_BUMPER

4
src/info.h
View file

@ -1276,6 +1276,7 @@ typedef enum sprite
SPR_SENB, // Cabotron SPR_SENB, // Cabotron
SPR_SENC, // Cabotron SPR_SENC, // Cabotron
SPR_SEAS, // Starstream SPR_SEAS, // Starstream
SPR_S_SP, // Mace
// Tutorial // Tutorial
SPR_TLKP, // Talk Point SPR_TLKP, // Talk Point
@ -4018,6 +4019,9 @@ typedef enum state
// MT_SSCHAINSOUND // MT_SSCHAINSOUND
S_SSCHAINSOUND, S_SSCHAINSOUND,
// MT_SLSTMACE
S_SLSTMACE,
// MT_SEALEDSTAR_BUMPER // MT_SEALEDSTAR_BUMPER
S_SEALEDSTAR_BUMPER, S_SEALEDSTAR_BUMPER,
S_SEALEDSTAR_BUMPERHIT, S_SEALEDSTAR_BUMPERHIT,