Order of state enums was different to that of info table, so corrected.
This commit is contained in:
parent
8370064706
commit
668acad8a7
13
src/info.c
13
src/info.c
|
@ -3326,6 +3326,12 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_BOWH, 2, 2, {NULL}, 0, 0, S_BOWLINGHIT4}, // S_BOWLINGHIT3
|
{SPR_BOWH, 2, 2, {NULL}, 0, 0, S_BOWLINGHIT4}, // S_BOWLINGHIT3
|
||||||
{SPR_BOWH, 3, 2, {NULL}, 0, 0, S_NULL}, // S_BOWLINGHIT4
|
{SPR_BOWH, 3, 2, {NULL}, 0, 0, S_NULL}, // S_BOWLINGHIT4
|
||||||
|
|
||||||
|
{SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDTOAD
|
||||||
|
{SPR_TOAH, 0, 4, {A_BunnyHop}, 10, 60, S_TOADHIT2}, // S_TOADHIT1
|
||||||
|
{SPR_TOAH, 1, 3, {NULL}, 0, 0, S_TOADHIT3}, // S_TOADHIT2
|
||||||
|
{SPR_TOAH, 2, 3, {NULL}, 0, 0, S_TOADHIT4}, // S_TOADHIT3
|
||||||
|
{SPR_TOAH, 3, 3, {NULL}, 0, 0, S_EBARREL18}, // S_TOADHIT4
|
||||||
|
|
||||||
{SPR_BRRL, 0, 1, {A_Look}, (96<<16)|1, 0, S_EBARRELIDLE}, // S_EBARRELIDLE
|
{SPR_BRRL, 0, 1, {A_Look}, (96<<16)|1, 0, S_EBARRELIDLE}, // S_EBARRELIDLE
|
||||||
{SPR_BRRR, 0, 4, {NULL}, 0, 0, S_EBARREL2}, // S_EBARREL1
|
{SPR_BRRR, 0, 4, {NULL}, 0, 0, S_EBARREL2}, // S_EBARREL1
|
||||||
{SPR_BRRR, 1, 4, {NULL}, 0, 0, S_EBARREL3}, // S_EBARREL2
|
{SPR_BRRR, 1, 4, {NULL}, 0, 0, S_EBARREL3}, // S_EBARREL2
|
||||||
|
@ -3369,12 +3375,6 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_HBSO, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON2}, // S_BOOSTON1
|
{SPR_HBSO, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON2}, // S_BOOSTON1
|
||||||
{SPR_HBSO, 1|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON1}, // S_BOOSTON2
|
{SPR_HBSO, 1|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON1}, // S_BOOSTON2
|
||||||
|
|
||||||
{SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDTOAD
|
|
||||||
{SPR_TOAH, 0, 4, {A_BunnyHop}, 10, 60, S_TOADHIT2}, // S_TOADHIT1
|
|
||||||
{SPR_TOAH, 1, 3, {NULL}, 0, 0, S_TOADHIT3}, // S_TOADHIT2
|
|
||||||
{SPR_TOAH, 2, 3, {NULL}, 0, 0, S_TOADHIT4}, // S_TOADHIT3
|
|
||||||
{SPR_TOAH, 3, 3, {NULL}, 0, 0, S_EBARREL18}, // S_TOADHIT4
|
|
||||||
|
|
||||||
{SPR_WBLZ, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIZARDMAN
|
{SPR_WBLZ, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIZARDMAN
|
||||||
{SPR_WBLN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIONMAN
|
{SPR_WBLN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIONMAN
|
||||||
{SPR_MSMF, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_MOUSEMAN2}, // S_MOUSEMAN1
|
{SPR_MSMF, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_MOUSEMAN2}, // S_MOUSEMAN1
|
||||||
|
@ -19469,6 +19469,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
sfx_None, // activesound
|
sfx_None, // activesound
|
||||||
MF_SCENERY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
|
MF_SCENERY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
{ // MT_BLUEFIRE
|
{ // MT_BLUEFIRE
|
||||||
749, // doomednum
|
749, // doomednum
|
||||||
|
|
16
src/info.h
16
src/info.h
|
@ -3940,42 +3940,51 @@ typedef enum state
|
||||||
S_BLUEFIRE2,
|
S_BLUEFIRE2,
|
||||||
S_BLUEFIRE3,
|
S_BLUEFIRE3,
|
||||||
S_BLUEFIRE4,
|
S_BLUEFIRE4,
|
||||||
|
|
||||||
S_GREENFIRE1,
|
S_GREENFIRE1,
|
||||||
S_GREENFIRE2,
|
S_GREENFIRE2,
|
||||||
S_GREENFIRE3,
|
S_GREENFIRE3,
|
||||||
S_GREENFIRE4,
|
S_GREENFIRE4,
|
||||||
|
|
||||||
S_REGALCHEST,
|
S_REGALCHEST,
|
||||||
S_CHIMERASTATUE,
|
S_CHIMERASTATUE,
|
||||||
S_DRAGONSTATUE,
|
S_DRAGONSTATUE,
|
||||||
S_LIZARDMANSTATUE,
|
S_LIZARDMANSTATUE,
|
||||||
S_PEGASUSSTATUE,
|
S_PEGASUSSTATUE,
|
||||||
|
|
||||||
S_ZELDAFIRE1,
|
S_ZELDAFIRE1,
|
||||||
S_ZELDAFIRE2,
|
S_ZELDAFIRE2,
|
||||||
S_ZELDAFIRE3,
|
S_ZELDAFIRE3,
|
||||||
S_ZELDAFIRE4,
|
S_ZELDAFIRE4,
|
||||||
|
|
||||||
S_GANBARETHING,
|
S_GANBARETHING,
|
||||||
S_GANBAREDUCK,
|
S_GANBAREDUCK,
|
||||||
S_GANBARETREE,
|
S_GANBARETREE,
|
||||||
|
|
||||||
S_MONOIDLE,
|
S_MONOIDLE,
|
||||||
S_MONOCHASE1,
|
S_MONOCHASE1,
|
||||||
S_MONOCHASE2,
|
S_MONOCHASE2,
|
||||||
S_MONOCHASE3,
|
S_MONOCHASE3,
|
||||||
S_MONOCHASE4,
|
S_MONOCHASE4,
|
||||||
S_MONOPAIN,
|
S_MONOPAIN,
|
||||||
|
|
||||||
S_REDZELDAFIRE1,
|
S_REDZELDAFIRE1,
|
||||||
S_REDZELDAFIRE2,
|
S_REDZELDAFIRE2,
|
||||||
S_REDZELDAFIRE3,
|
S_REDZELDAFIRE3,
|
||||||
S_REDZELDAFIRE4,
|
S_REDZELDAFIRE4,
|
||||||
|
|
||||||
S_BOWLINGPIN,
|
S_BOWLINGPIN,
|
||||||
S_BOWLINGHIT1,
|
S_BOWLINGHIT1,
|
||||||
S_BOWLINGHIT2,
|
S_BOWLINGHIT2,
|
||||||
S_BOWLINGHIT3,
|
S_BOWLINGHIT3,
|
||||||
S_BOWLINGHIT4,
|
S_BOWLINGHIT4,
|
||||||
|
|
||||||
S_ARIDTOAD,
|
S_ARIDTOAD,
|
||||||
S_TOADHIT1,
|
S_TOADHIT1,
|
||||||
S_TOADHIT2,
|
S_TOADHIT2,
|
||||||
S_TOADHIT3,
|
S_TOADHIT3,
|
||||||
S_TOADHIT4,
|
S_TOADHIT4,
|
||||||
|
|
||||||
S_EBARRELIDLE,
|
S_EBARRELIDLE,
|
||||||
S_EBARREL1,
|
S_EBARREL1,
|
||||||
S_EBARREL2,
|
S_EBARREL2,
|
||||||
|
@ -3995,23 +4004,30 @@ typedef enum state
|
||||||
S_EBARREL16,
|
S_EBARREL16,
|
||||||
S_EBARREL17,
|
S_EBARREL17,
|
||||||
S_EBARREL18,
|
S_EBARREL18,
|
||||||
|
|
||||||
S_MERRYHORSE,
|
S_MERRYHORSE,
|
||||||
|
|
||||||
S_BLUEFRUIT,
|
S_BLUEFRUIT,
|
||||||
S_ORANGEFRUIT,
|
S_ORANGEFRUIT,
|
||||||
S_REDFRUIT,
|
S_REDFRUIT,
|
||||||
S_PINKFRUIT,
|
S_PINKFRUIT,
|
||||||
|
|
||||||
S_ADVENTURESPIKEA1,
|
S_ADVENTURESPIKEA1,
|
||||||
S_ADVENTURESPIKEA2,
|
S_ADVENTURESPIKEA2,
|
||||||
S_ADVENTURESPIKEB1,
|
S_ADVENTURESPIKEB1,
|
||||||
S_ADVENTURESPIKEB2,
|
S_ADVENTURESPIKEB2,
|
||||||
S_ADVENTURESPIKEC1,
|
S_ADVENTURESPIKEC1,
|
||||||
S_ADVENTURESPIKEC2,
|
S_ADVENTURESPIKEC2,
|
||||||
|
|
||||||
S_BOOSTPROMPT1,
|
S_BOOSTPROMPT1,
|
||||||
S_BOOSTPROMPT2,
|
S_BOOSTPROMPT2,
|
||||||
|
|
||||||
S_BOOSTOFF1,
|
S_BOOSTOFF1,
|
||||||
S_BOOSTOFF2,
|
S_BOOSTOFF2,
|
||||||
|
|
||||||
S_BOOSTON1,
|
S_BOOSTON1,
|
||||||
S_BOOSTON2,
|
S_BOOSTON2,
|
||||||
|
|
||||||
S_LIZARDMAN,
|
S_LIZARDMAN,
|
||||||
S_LIONMAN,
|
S_LIONMAN,
|
||||||
S_MOUSEMAN1,
|
S_MOUSEMAN1,
|
||||||
|
|
Loading…
Reference in a new issue