stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 17:22:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dash state for Tails overlay

Browse source
This commit is contained in:
Zippy_Zolton 2020-10-23 00:47:47 -05:00
parent 1cd73315f1
commit a4459b6693
4 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -5178,6 +5178,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_TAILSOVERLAY_PAIN", "S_TAILSOVERLAY_PAIN",
"S_TAILSOVERLAY_GASP", "S_TAILSOVERLAY_GASP",
"S_TAILSOVERLAY_EDGE", "S_TAILSOVERLAY_EDGE",
"S_TAILSOVERLAY_DASH",
// [: // [:
"S_JETFUMEFLASH", "S_JETFUMEFLASH",

3
src/info.c
View file

@ -584,6 +584,7 @@ char spr2names[NUMPLAYERSPRITES][5] =
"TAL9", "TAL9",
"TALA", "TALA",
"TALB", "TALB",
"TALC",
"CNT1", "CNT1",
"CNT2", "CNT2",
@ -661,6 +662,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = {
SPR2_TAL0, // SPR2_TAL9, SPR2_TAL0, // SPR2_TAL9,
SPR2_TAL9, // SPR2_TALA, SPR2_TAL9, // SPR2_TALA,
SPR2_TAL0, // SPR2_TALB, SPR2_TAL0, // SPR2_TALB,
SPR2_TAL0, // SPR2_TALC,
SPR2_WAIT, // SPR2_CNT1, SPR2_WAIT, // SPR2_CNT1,
SPR2_FALL, // SPR2_CNT2, SPR2_FALL, // SPR2_CNT2,
@ -801,6 +803,7 @@ state_t states[NUMSTATES] =
{SPR_PLAY, SPR2_TAL9|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PAIN}, // S_TAILSOVERLAY_PAIN {SPR_PLAY, SPR2_TAL9|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PAIN}, // S_TAILSOVERLAY_PAIN
{SPR_PLAY, SPR2_TALA|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_GASP}, // S_TAILSOVERLAY_GASP {SPR_PLAY, SPR2_TALA|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_GASP}, // S_TAILSOVERLAY_GASP
{SPR_PLAY, SPR2_TALB , 35, {NULL}, 0, 0, S_TAILSOVERLAY_EDGE}, // S_TAILSOVERLAY_EDGE {SPR_PLAY, SPR2_TALB , 35, {NULL}, 0, 0, S_TAILSOVERLAY_EDGE}, // S_TAILSOVERLAY_EDGE
{SPR_PLAY, SPR2_TALC|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_DASH}, // S_TAILSOVERLAY_DASH
// [: // [:
{SPR_JETF, 3|FF_ANIMATE|FF_FULLBRIGHT, 2, {NULL}, 1, 1, S_JETFUME1}, // S_JETFUMEFLASH {SPR_JETF, 3|FF_ANIMATE|FF_FULLBRIGHT, 2, {NULL}, 1, 1, S_JETFUME1}, // S_JETFUMEFLASH

1
src/info.h
View file

@ -997,6 +997,7 @@ typedef enum state
S_TAILSOVERLAY_PAIN, S_TAILSOVERLAY_PAIN,
S_TAILSOVERLAY_GASP, S_TAILSOVERLAY_GASP,
S_TAILSOVERLAY_EDGE, S_TAILSOVERLAY_EDGE,
S_TAILSOVERLAY_DASH,
// [: // [:
S_JETFUMEFLASH, S_JETFUMEFLASH,

2
src/p_user.c
View file

@ -11208,6 +11208,8 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
chosenstate = S_TAILSOVERLAY_EDGE; chosenstate = S_TAILSOVERLAY_EDGE;
else if (player->panim == PA_RUN) else if (player->panim == PA_RUN)
chosenstate = S_TAILSOVERLAY_RUN; chosenstate = S_TAILSOVERLAY_RUN;
else if (player->panim == PA_DASH)
chosenstate = S_TAILSOVERLAY_DASH;
else if (player->panim == PA_WALK) else if (player->panim == PA_WALK)
{ {
if (!smilesonground || player->mo->state-states == S_PLAY_SKID) if (!smilesonground || player->mo->state-states == S_PLAY_SKID)