From a4459b6693b969088ae307020d664910ae2aee95 Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Fri, 23 Oct 2020 00:47:47 -0500 Subject: [PATCH 1/3] Dash state for Tails overlay --- src/dehacked.c | 1 + src/info.c | 3 +++ src/info.h | 1 + src/p_user.c | 2 ++ 4 files changed, 7 insertions(+) diff --git a/src/dehacked.c b/src/dehacked.c index ca013a25d..34fe58362 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -5178,6 +5178,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_TAILSOVERLAY_PAIN", "S_TAILSOVERLAY_GASP", "S_TAILSOVERLAY_EDGE", + "S_TAILSOVERLAY_DASH", // [: "S_JETFUMEFLASH", diff --git a/src/info.c b/src/info.c index cb5fb0889..8cdfaa8a0 100644 --- a/src/info.c +++ b/src/info.c @@ -584,6 +584,7 @@ char spr2names[NUMPLAYERSPRITES][5] = "TAL9", "TALA", "TALB", + "TALC", "CNT1", "CNT2", @@ -661,6 +662,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = { SPR2_TAL0, // SPR2_TAL9, SPR2_TAL9, // SPR2_TALA, SPR2_TAL0, // SPR2_TALB, + SPR2_TAL0, // SPR2_TALC, SPR2_WAIT, // SPR2_CNT1, 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_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_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 diff --git a/src/info.h b/src/info.h index 721ebf7f2..8130cf948 100644 --- a/src/info.h +++ b/src/info.h @@ -997,6 +997,7 @@ typedef enum state S_TAILSOVERLAY_PAIN, S_TAILSOVERLAY_GASP, S_TAILSOVERLAY_EDGE, + S_TAILSOVERLAY_DASH, // [: S_JETFUMEFLASH, diff --git a/src/p_user.c b/src/p_user.c index 0d7331293..da33f1dbb 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -11208,6 +11208,8 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails) chosenstate = S_TAILSOVERLAY_EDGE; else if (player->panim == PA_RUN) chosenstate = S_TAILSOVERLAY_RUN; + else if (player->panim == PA_DASH) + chosenstate = S_TAILSOVERLAY_DASH; else if (player->panim == PA_WALK) { if (!smilesonground || player->mo->state-states == S_PLAY_SKID) From c0571b5fbf41918842f8b6fecf5854572ed7635b Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Fri, 23 Oct 2020 01:09:12 -0500 Subject: [PATCH 2/3] g --- src/info.h | 1 + src/p_user.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/info.h b/src/info.h index 8130cf948..d84461617 100644 --- a/src/info.h +++ b/src/info.h @@ -856,6 +856,7 @@ typedef enum playersprite SPR2_TAL9, SPR2_TALA, SPR2_TALB, + SPR2_TALC, SPR2_CNT1, // continue disappointment SPR2_CNT2, // continue lift diff --git a/src/p_user.c b/src/p_user.c index da33f1dbb..051965eb5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -11206,10 +11206,10 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails) chosenstate = S_TAILSOVERLAY_GASP; else if (player->mo->state-states == S_PLAY_EDGE) chosenstate = S_TAILSOVERLAY_EDGE; - else if (player->panim == PA_RUN) - chosenstate = S_TAILSOVERLAY_RUN; else if (player->panim == PA_DASH) chosenstate = S_TAILSOVERLAY_DASH; + else if (player->panim == PA_RUN) + chosenstate = S_TAILSOVERLAY_RUN; else if (player->panim == PA_WALK) { if (!smilesonground || player->mo->state-states == S_PLAY_SKID) From 85692ac4090c68dc4bc519f230b7d69226b47263 Mon Sep 17 00:00:00 2001 From: Zolton Auburn Date: Fri, 23 Oct 2020 14:04:02 -0400 Subject: [PATCH 3/3] Update info.c --- src/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index 8cdfaa8a0..29a79b1d6 100644 --- a/src/info.c +++ b/src/info.c @@ -662,7 +662,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = { SPR2_TAL0, // SPR2_TAL9, SPR2_TAL9, // SPR2_TALA, SPR2_TAL0, // SPR2_TALB, - SPR2_TAL0, // SPR2_TALC, + SPR2_TAL6, // SPR2_TALC, SPR2_WAIT, // SPR2_CNT1, SPR2_FALL, // SPR2_CNT2,