lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

animate icons using FF_ANIMATE 

(this also means they last one second again, and the powerup is given after 1/2 a second, things which were lost when the flip was added)
This commit is contained in:
Inuyasha 2016-09-25 20:55:08 -07:00
parent 1a4b894589
commit 1d71dfa5a3
3 changed files with 37 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/dehacked.c
View File

@ -4900,102 +4900,54 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_BLUEBOX_POP1",
"S_BLUEBOX_POP2",
// Box Icons -- 5 states each, one for each part of the twirl
// Box Icons -- 2 states each, animation and action
"S_RING_ICON1",
"S_RING_ICON2",
"S_RING_ICON3",
"S_RING_ICON4",
"S_RING_ICON5",
"S_PITY_ICON1",
"S_PITY_ICON2",
"S_PITY_ICON3",
"S_PITY_ICON4",
"S_PITY_ICON5",
"S_ATTRACT_ICON1",
"S_ATTRACT_ICON2",
"S_ATTRACT_ICON3",
"S_ATTRACT_ICON4",
"S_ATTRACT_ICON5",
"S_FORCE_ICON1",
"S_FORCE_ICON2",
"S_FORCE_ICON3",
"S_FORCE_ICON4",
"S_FORCE_ICON5",
"S_ARMAGEDDON_ICON1",
"S_ARMAGEDDON_ICON2",
"S_ARMAGEDDON_ICON3",
"S_ARMAGEDDON_ICON4",
"S_ARMAGEDDON_ICON5",
"S_WHIRLWIND_ICON1",
"S_WHIRLWIND_ICON2",
"S_WHIRLWIND_ICON3",
"S_WHIRLWIND_ICON4",
"S_WHIRLWIND_ICON5",
"S_ELEMENTAL_ICON1",
"S_ELEMENTAL_ICON2",
"S_ELEMENTAL_ICON3",
"S_ELEMENTAL_ICON4",
"S_ELEMENTAL_ICON5",
"S_SNEAKERS_ICON1",
"S_SNEAKERS_ICON2",
"S_SNEAKERS_ICON3",
"S_SNEAKERS_ICON4",
"S_SNEAKERS_ICON5",
"S_INVULN_ICON1",
"S_INVULN_ICON2",
"S_INVULN_ICON3",
"S_INVULN_ICON4",
"S_INVULN_ICON5",
"S_1UP_ICON1",
"S_1UP_ICON2",
"S_1UP_ICON3",
"S_1UP_ICON4",
"S_1UP_ICON5",
"S_EGGMAN_ICON1",
"S_EGGMAN_ICON2",
"S_EGGMAN_ICON3",
"S_EGGMAN_ICON4",
"S_EGGMAN_ICON5",
"S_MIXUP_ICON1",
"S_MIXUP_ICON2",
"S_MIXUP_ICON3",
"S_MIXUP_ICON4",
"S_MIXUP_ICON5",
"S_GRAVITY_ICON1",
"S_GRAVITY_ICON2",
"S_GRAVITY_ICON3",
"S_GRAVITY_ICON4",
"S_GRAVITY_ICON5",
"S_RECYCLER_ICON1",
"S_RECYCLER_ICON2",
"S_RECYCLER_ICON3",
"S_RECYCLER_ICON4",
"S_RECYCLER_ICON5",
"S_SCORE1K_ICON1",
"S_SCORE1K_ICON2",
"S_SCORE1K_ICON3",
"S_SCORE1K_ICON4",
"S_SCORE1K_ICON5",
"S_SCORE10K_ICON1",
"S_SCORE10K_ICON2",
"S_SCORE10K_ICON3",
"S_SCORE10K_ICON4",
"S_SCORE10K_ICON5",
"S_ROCKET",

118
src/info.c
View File

@ -40,7 +40,7 @@ char sprnames[NUMSPRITES + 1][5] =
"RING","TRNG","EMMY","TOKE","RFLG","BFLG","NWNG","EMBM","CEMG","EMER",
"FANS","BUBL","SIGN","STEM","SPIK","SFLM","USPK","STPT","BMNE",
"MSTV","XLTV","TRRI","TBRI","TVRI","TVPI","TVAT","TVFO","TVAR","TVWW",
"TVEL","TVSS","TVIV","TV1U","TV1P","TVEG","TVMX","TVMY","TVGV","TVRC",
"TV1K","TVTK",
@ -222,7 +222,7 @@ state_t states[NUMSTATES] =
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_PLAY_BOX1}, // S_PLAY_BOX2
{SPR_PLAY, SPR2_LIFE, 4, {NULL}, 0, 4, S_PLAY_ICON2}, // S_PLAY_ICON1
{SPR_NULL, 0, 12, {NULL}, 0, 0, S_PLAY_ICON3}, // S_PLAY_ICON2
{SPR_PLAY, SPR2_LIFE, 18, {NULL}, 0, 4, S_NULL}, // S_PLAY_ICON3
{SPR_PLAY, SPR2_LIFE, 19, {NULL}, 0, 4, S_NULL}, // S_PLAY_ICON3
// Level end sign (uses player sprite)
{SPR_PLAY, SPR2_SIGN, 1, {NULL}, 0, 24, S_PLAY_SIGN}, // S_PLAY_SIGN
@ -1254,102 +1254,54 @@ state_t states[NUMSTATES] =
{SPR_TBRI, 1, 4, {A_MonitorPop}, 0, 0, S_BLUEBOX_POP2}, // S_BLUEBOX_POP1
{SPR_TBRI, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BLUEBOX_POP2
// Box Icons -- 5 states each, one for each part of the twirl
{SPR_TVRI, 2, 4, {NULL}, 0, 0, S_RING_ICON2}, // S_RING_ICON1
{SPR_TVRI, 3, 4, {NULL}, 0, 0, S_RING_ICON3}, // S_RING_ICON2
{SPR_TVRI, 4, 4, {NULL}, 0, 0, S_RING_ICON4}, // S_RING_ICON3
{SPR_TVRI, 5, 4, {NULL}, 0, 0, S_RING_ICON5}, // S_RING_ICON4
{SPR_TVRI, 2, 18, {A_RingBox}, 0, 0, S_NULL}, // S_RING_ICON5
// Box Icons -- 2 states each, animation and action
{SPR_TVRI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RING_ICON2}, // S_RING_ICON1
{SPR_TVRI, 2, 17, {A_RingBox}, 0, 0, S_NULL}, // S_RING_ICON2
{SPR_TVPI, 2, 4, {NULL}, 0, 0, S_PITY_ICON2}, // S_PITY_ICON1
{SPR_TVPI, 3, 4, {NULL}, 0, 0, S_PITY_ICON3}, // S_PITY_ICON2
{SPR_TVPI, 4, 4, {NULL}, 0, 0, S_PITY_ICON4}, // S_PITY_ICON3
{SPR_TVPI, 5, 4, {NULL}, 0, 0, S_PITY_ICON5}, // S_PITY_ICON4
{SPR_TVPI, 2, 18, {A_PityShield}, 0, 0, S_NULL}, // S_PITY_ICON5
{SPR_TVPI, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_PITY_ICON2}, // S_PITY_ICON1
{SPR_TVPI, 2, 17, {A_PityShield}, 0, 0, S_NULL}, // S_PITY_ICON2
{SPR_TVAT, 2, 4, {NULL}, 0, 0, S_ATTRACT_ICON2}, // S_ATTRACT_ICON1
{SPR_TVAT, 3, 4, {NULL}, 0, 0, S_ATTRACT_ICON3}, // S_ATTRACT_ICON2
{SPR_TVAT, 4, 4, {NULL}, 0, 0, S_ATTRACT_ICON4}, // S_ATTRACT_ICON3
{SPR_TVAT, 5, 4, {NULL}, 0, 0, S_ATTRACT_ICON5}, // S_ATTRACT_ICON4
{SPR_TVAT, 2, 18, {A_RingShield},0, 0, S_NULL}, // S_ATTRACT_ICON5
{SPR_TVAT, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ATTRACT_ICON2}, // S_ATTRACT_ICON1
{SPR_TVAT, 2, 17, {A_RingShield},0, 0, S_NULL}, // S_ATTRACT_ICON2
{SPR_TVFO, 2, 4, {NULL}, 0, 0, S_FORCE_ICON2}, // S_FORCE_ICON1
{SPR_TVFO, 3, 4, {NULL}, 0, 0, S_FORCE_ICON3}, // S_FORCE_ICON2
{SPR_TVFO, 4, 4, {NULL}, 0, 0, S_FORCE_ICON4}, // S_FORCE_ICON3
{SPR_TVFO, 5, 4, {NULL}, 0, 0, S_FORCE_ICON5}, // S_FORCE_ICON4
{SPR_TVFO, 2, 18, {A_ForceShield}, 0, 0, S_NULL}, // S_FORCE_ICON5
{SPR_TVFO, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_FORCE_ICON2}, // S_FORCE_ICON1
{SPR_TVFO, 2, 17, {A_ForceShield}, 0, 0, S_NULL}, // S_FORCE_ICON2
{SPR_TVAR, 2, 4, {NULL}, 0, 0, S_ARMAGEDDON_ICON2}, // S_ARMAGEDDON_ICON1
{SPR_TVAR, 3, 4, {NULL}, 0, 0, S_ARMAGEDDON_ICON3}, // S_ARMAGEDDON_ICON2
{SPR_TVAR, 4, 4, {NULL}, 0, 0, S_ARMAGEDDON_ICON4}, // S_ARMAGEDDON_ICON3
{SPR_TVAR, 5, 4, {NULL}, 0, 0, S_ARMAGEDDON_ICON5}, // S_ARMAGEDDON_ICON4
{SPR_TVAR, 2, 18, {A_BombShield}, 0, 0, S_NULL}, // S_ARMAGEDDON_ICON5
{SPR_TVAR, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ARMAGEDDON_ICON2}, // S_ARMAGEDDON_ICON1
{SPR_TVAR, 2, 17, {A_BombShield}, 0, 0, S_NULL}, // S_ARMAGEDDON_ICON2
{SPR_TVWW, 2, 4, {NULL}, 0, 0, S_WHIRLWIND_ICON2}, // S_WHIRLWIND_ICON1
{SPR_TVWW, 3, 4, {NULL}, 0, 0, S_WHIRLWIND_ICON3}, // S_WHIRLWIND_ICON2
{SPR_TVWW, 4, 4, {NULL}, 0, 0, S_WHIRLWIND_ICON4}, // S_WHIRLWIND_ICON3
{SPR_TVWW, 5, 4, {NULL}, 0, 0, S_WHIRLWIND_ICON5}, // S_WHIRLWIND_ICON4
{SPR_TVWW, 2, 18, {A_JumpShield}, 0, 0, S_NULL}, // S_WHIRLWIND_ICON5
{SPR_TVWW, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_WHIRLWIND_ICON2}, // S_WHIRLWIND_ICON1
{SPR_TVWW, 2, 17, {A_JumpShield}, 0, 0, S_NULL}, // S_WHIRLWIND_ICON2
{SPR_TVEL, 2, 4, {NULL}, 0, 0, S_ELEMENTAL_ICON2}, // S_ELEMENTAL_ICON1
{SPR_TVEL, 3, 4, {NULL}, 0, 0, S_ELEMENTAL_ICON3}, // S_ELEMENTAL_ICON2
{SPR_TVEL, 4, 4, {NULL}, 0, 0, S_ELEMENTAL_ICON4}, // S_ELEMENTAL_ICON3
{SPR_TVEL, 5, 4, {NULL}, 0, 0, S_ELEMENTAL_ICON5}, // S_ELEMENTAL_ICON4
{SPR_TVEL, 2, 18, {A_WaterShield}, 0, 0, S_NULL}, // S_ELEMENTAL_ICON5
{SPR_TVEL, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_ELEMENTAL_ICON2}, // S_ELEMENTAL_ICON1
{SPR_TVEL, 2, 17, {A_WaterShield}, 0, 0, S_NULL}, // S_ELEMENTAL_ICON2
{SPR_TVSS, 2, 4, {NULL}, 0, 0, S_SNEAKERS_ICON2}, // S_SNEAKERS_ICON1
{SPR_TVSS, 3, 4, {NULL}, 0, 0, S_SNEAKERS_ICON3}, // S_SNEAKERS_ICON2
{SPR_TVSS, 4, 4, {NULL}, 0, 0, S_SNEAKERS_ICON4}, // S_SNEAKERS_ICON3
{SPR_TVSS, 5, 4, {NULL}, 0, 0, S_SNEAKERS_ICON5}, // S_SNEAKERS_ICON4
{SPR_TVSS, 2, 18, {A_SuperSneakers}, 0, 0, S_NULL}, // S_SNEAKERS_ICON5
{SPR_TVSS, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SNEAKERS_ICON2}, // S_SNEAKERS_ICON1
{SPR_TVSS, 2, 17, {A_SuperSneakers}, 0, 0, S_NULL}, // S_SNEAKERS_ICON2
{SPR_TVIV, 2, 4, {NULL}, 0, 0, S_INVULN_ICON2}, // S_INVULN_ICON1
{SPR_TVIV, 3, 4, {NULL}, 0, 0, S_INVULN_ICON3}, // S_INVULN_ICON2
{SPR_TVIV, 4, 4, {NULL}, 0, 0, S_INVULN_ICON4}, // S_INVULN_ICON3
{SPR_TVIV, 5, 4, {NULL}, 0, 0, S_INVULN_ICON5}, // S_INVULN_ICON4
{SPR_TVIV, 2, 18, {A_Invincibility}, 0, 0, S_NULL}, // S_INVULN_ICON5
{SPR_TVIV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_INVULN_ICON2}, // S_INVULN_ICON1
{SPR_TVIV, 2, 17, {A_Invincibility}, 0, 0, S_NULL}, // S_INVULN_ICON2
{SPR_TV1U, 2, 4, {NULL}, 0, 0, S_1UP_ICON2}, // S_1UP_ICON1
{SPR_TV1U, 3, 4, {NULL}, 0, 0, S_1UP_ICON3}, // S_1UP_ICON2
{SPR_TV1U, 4, 4, {NULL}, 0, 0, S_1UP_ICON4}, // S_1UP_ICON3
{SPR_TV1U, 5, 4, {NULL}, 0, 0, S_1UP_ICON5}, // S_1UP_ICON4
{SPR_TV1U, 2, 18, {A_ExtraLife}, 0, 0, S_NULL}, // S_1UP_ICON5
{SPR_TV1U, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_1UP_ICON2}, // S_1UP_ICON1
{SPR_TV1U, 2, 17, {A_ExtraLife}, 0, 0, S_NULL}, // S_1UP_ICON2
{SPR_TVEG, 2, 4, {NULL}, 0, 0, S_EGGMAN_ICON2}, // S_EGGMAN_ICON1
{SPR_TVEG, 3, 4, {NULL}, 0, 0, S_EGGMAN_ICON3}, // S_EGGMAN_ICON2
{SPR_TVEG, 4, 4, {NULL}, 0, 0, S_EGGMAN_ICON4}, // S_EGGMAN_ICON3
{SPR_TVEG, 5, 4, {NULL}, 0, 0, S_EGGMAN_ICON5}, // S_EGGMAN_ICON4
{SPR_TVEG, 2, 18, {A_EggmanBox}, 0, 0, S_NULL}, // S_EGGMAN_ICON5
{SPR_TVEG, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_EGGMAN_ICON2}, // S_EGGMAN_ICON1
{SPR_TVEG, 2, 17, {A_EggmanBox}, 0, 0, S_NULL}, // S_EGGMAN_ICON2
{SPR_TVMX, 2, 4, {NULL}, 0, 0, S_MIXUP_ICON2}, // S_MIXUP_ICON1
{SPR_TVMX, 3, 4, {NULL}, 0, 0, S_MIXUP_ICON3}, // S_MIXUP_ICON2
{SPR_TVMX, 4, 4, {NULL}, 0, 0, S_MIXUP_ICON4}, // S_MIXUP_ICON3
{SPR_TVMX, 5, 4, {NULL}, 0, 0, S_MIXUP_ICON5}, // S_MIXUP_ICON4
{SPR_TVMX, 2, 18, {A_MixUp}, 0, 0, S_NULL}, // S_MIXUP_ICON5
{SPR_TVMX, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_MIXUP_ICON2}, // S_MIXUP_ICON1
{SPR_TVMX, 2, 17, {A_MixUp}, 0, 0, S_NULL}, // S_MIXUP_ICON2
{SPR_TVGV, 2, 4, {NULL}, 0, 0, S_GRAVITY_ICON2}, // S_GRAVITY_ICON1
{SPR_TVGV, 3, 4, {NULL}, 0, 0, S_GRAVITY_ICON3}, // S_GRAVITY_ICON2
{SPR_TVGV, 4, 4, {NULL}, 0, 0, S_GRAVITY_ICON4}, // S_GRAVITY_ICON3
{SPR_TVGV, 5, 4, {NULL}, 0, 0, S_GRAVITY_ICON5}, // S_GRAVITY_ICON4
{SPR_TVGV, 2, 18, {A_GravityBox}, 0, 0, S_NULL}, // S_GRAVITY_ICON5
{SPR_TVGV, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_GRAVITY_ICON2}, // S_GRAVITY_ICON1
{SPR_TVGV, 2, 17, {A_GravityBox}, 0, 0, S_NULL}, // S_GRAVITY_ICON2
{SPR_TVRC, 2, 4, {NULL}, 0, 0, S_RECYCLER_ICON2}, // S_RECYCLER_ICON1
{SPR_TVRC, 3, 4, {NULL}, 0, 0, S_RECYCLER_ICON3}, // S_RECYCLER_ICON2
{SPR_TVRC, 4, 4, {NULL}, 0, 0, S_RECYCLER_ICON4}, // S_RECYCLER_ICON3
{SPR_TVRC, 5, 4, {NULL}, 0, 0, S_RECYCLER_ICON5}, // S_RECYCLER_ICON4
{SPR_TVRC, 2, 18, {A_RecyclePowers}, 0, 0, S_NULL}, // S_RECYCLER_ICON5
{SPR_TVRC, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_RECYCLER_ICON2}, // S_RECYCLER_ICON1
{SPR_TVRC, 2, 17, {A_RecyclePowers}, 0, 0, S_NULL}, // S_RECYCLER_ICON2
{SPR_TV1K, 2, 4, {NULL}, 0, 0, S_SCORE1K_ICON2}, // S_SCORE1K_ICON1
{SPR_TV1K, 3, 4, {NULL}, 0, 0, S_SCORE1K_ICON3}, // S_SCORE1K_ICON2
{SPR_TV1K, 4, 4, {NULL}, 0, 0, S_SCORE1K_ICON4}, // S_SCORE1K_ICON3
{SPR_TV1K, 5, 4, {NULL}, 0, 0, S_SCORE1K_ICON5}, // S_SCORE1K_ICON4
{SPR_TV1K, 2, 18, {A_AwardScore}, 0, 0, S_NULL}, // S_SCORE1K_ICON5
{SPR_TV1K, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE1K_ICON2}, // S_SCORE1K_ICON1
{SPR_TV1K, 2, 17, {A_AwardScore}, 0, 0, S_NULL}, // S_SCORE1K_ICON2
{SPR_TVTK, 2, 4, {NULL}, 0, 0, S_SCORE10K_ICON2}, // S_SCORE10K_ICON1
{SPR_TVTK, 3, 4, {NULL}, 0, 0, S_SCORE10K_ICON3}, // S_SCORE10K_ICON2
{SPR_TVTK, 4, 4, {NULL}, 0, 0, S_SCORE10K_ICON4}, // S_SCORE10K_ICON3
{SPR_TVTK, 5, 4, {NULL}, 0, 0, S_SCORE10K_ICON5}, // S_SCORE10K_ICON4
{SPR_TVTK, 2, 18, {A_AwardScore}, 0, 0, S_NULL}, // S_SCORE10K_ICON5
{SPR_TVTK, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_SCORE10K_ICON2}, // S_SCORE10K_ICON1
{SPR_TVTK, 2, 17, {A_AwardScore}, 0, 0, S_NULL}, // S_SCORE10K_ICON2
// ---

50
src/info.h
View File

@ -1745,102 +1745,54 @@ typedef enum state
S_BLUEBOX_POP1,
S_BLUEBOX_POP2,
// Box Icons -- 5 states each, one for each part of the twirl
// Box Icons -- 2 states each, animation and action
S_RING_ICON1,
S_RING_ICON2,
S_RING_ICON3,
S_RING_ICON4,
S_RING_ICON5,
S_PITY_ICON1,
S_PITY_ICON2,
S_PITY_ICON3,
S_PITY_ICON4,
S_PITY_ICON5,
S_ATTRACT_ICON1,
S_ATTRACT_ICON2,
S_ATTRACT_ICON3,
S_ATTRACT_ICON4,
S_ATTRACT_ICON5,
S_FORCE_ICON1,
S_FORCE_ICON2,
S_FORCE_ICON3,
S_FORCE_ICON4,
S_FORCE_ICON5,
S_ARMAGEDDON_ICON1,
S_ARMAGEDDON_ICON2,
S_ARMAGEDDON_ICON3,
S_ARMAGEDDON_ICON4,
S_ARMAGEDDON_ICON5,
S_WHIRLWIND_ICON1,
S_WHIRLWIND_ICON2,
S_WHIRLWIND_ICON3,
S_WHIRLWIND_ICON4,
S_WHIRLWIND_ICON5,
S_ELEMENTAL_ICON1,
S_ELEMENTAL_ICON2,
S_ELEMENTAL_ICON3,
S_ELEMENTAL_ICON4,
S_ELEMENTAL_ICON5,
S_SNEAKERS_ICON1,
S_SNEAKERS_ICON2,
S_SNEAKERS_ICON3,
S_SNEAKERS_ICON4,
S_SNEAKERS_ICON5,
S_INVULN_ICON1,
S_INVULN_ICON2,
S_INVULN_ICON3,
S_INVULN_ICON4,
S_INVULN_ICON5,
S_1UP_ICON1,
S_1UP_ICON2,
S_1UP_ICON3,
S_1UP_ICON4,
S_1UP_ICON5,
S_EGGMAN_ICON1,
S_EGGMAN_ICON2,
S_EGGMAN_ICON3,
S_EGGMAN_ICON4,
S_EGGMAN_ICON5,
S_MIXUP_ICON1,
S_MIXUP_ICON2,
S_MIXUP_ICON3,
S_MIXUP_ICON4,
S_MIXUP_ICON5,
S_GRAVITY_ICON1,
S_GRAVITY_ICON2,
S_GRAVITY_ICON3,
S_GRAVITY_ICON4,
S_GRAVITY_ICON5,
S_RECYCLER_ICON1,
S_RECYCLER_ICON2,
S_RECYCLER_ICON3,
S_RECYCLER_ICON4,
S_RECYCLER_ICON5,
S_SCORE1K_ICON1,
S_SCORE1K_ICON2,
S_SCORE1K_ICON3,
S_SCORE1K_ICON4,
S_SCORE1K_ICON5,
S_SCORE10K_ICON1,
S_SCORE10K_ICON2,
S_SCORE10K_ICON3,
S_SCORE10K_ICON4,
S_SCORE10K_ICON5,
// ---