From ab705122531ab387bb88d0409f77ccd63075cffd Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 18 Nov 2019 22:05:05 +0000 Subject: [PATCH] As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. --- src/dehacked.c | 8 -------- src/info.c | 26 +++++++++----------------- src/info.h | 8 -------- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index be897b952..d3c0e9af0 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -4970,18 +4970,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_MINUS_UPWARD2", "S_MINUS_UPWARD3", "S_MINUS_UPWARD4", - "S_MINUS_UPWARD5", - "S_MINUS_UPWARD6", - "S_MINUS_UPWARD7", - "S_MINUS_UPWARD8", "S_MINUS_DOWNWARD1", "S_MINUS_DOWNWARD2", "S_MINUS_DOWNWARD3", "S_MINUS_DOWNWARD4", - "S_MINUS_DOWNWARD5", - "S_MINUS_DOWNWARD6", - "S_MINUS_DOWNWARD7", - "S_MINUS_DOWNWARD8", // Minus dirt "S_MINUSDIRT1", diff --git a/src/info.c b/src/info.c index b88d02932..4fb57c81d 100644 --- a/src/info.c +++ b/src/info.c @@ -1071,23 +1071,15 @@ state_t states[NUMSTATES] = {SPR_MNUD, 2|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST4}, // S_MINUS_BURST3 {SPR_MNUD, 3|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST5}, // S_MINUS_BURST4 {SPR_MNUD, 4|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUSDIRT2}, // S_MINUS_BURST5 - {SPR_MNUS, 0, 1, {A_MinusPopup}, 0, 0, S_MINUS_UPWARD1}, // S_MINUS_POPUP - {SPR_MNUS, 0, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD2}, // S_MINUS_UPWARD1 - {SPR_MNUS, 1, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD3}, // S_MINUS_UPWARD2 - {SPR_MNUS, 2, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD4}, // S_MINUS_UPWARD3 - {SPR_MNUS, 3, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD5}, // S_MINUS_UPWARD4 - {SPR_MNUS, 4, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD6}, // S_MINUS_UPWARD5 - {SPR_MNUS, 5, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD7}, // S_MINUS_UPWARD6 - {SPR_MNUS, 6, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD8}, // S_MINUS_UPWARD7 - {SPR_MNUS, 7, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD1}, // S_MINUS_UPWARD8 - {SPR_MNUS, 8, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD2}, // S_MINUS_DOWNWARD1 - {SPR_MNUS, 9, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD3}, // S_MINUS_DOWNWARD2 - {SPR_MNUS, 10, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD4}, // S_MINUS_DOWNWARD3 - {SPR_MNUS, 11, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD5}, // S_MINUS_DOWNWARD4 - {SPR_MNUS, 12, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD6}, // S_MINUS_DOWNWARD5 - {SPR_MNUS, 13, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD7}, // S_MINUS_DOWNWARD6 - {SPR_MNUS, 14, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD8}, // S_MINUS_DOWNWARD7 - {SPR_MNUS, 15, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD1}, // S_MINUS_DOWNWARD8 + {SPR_MNUS, 3, 1, {A_MinusPopup}, 0, 0, S_MINUS_UPWARD1}, // S_MINUS_POPUP + {SPR_MNUS, 0, 1, {A_MinusCheck}, 0, S_MINUS_DOWNWARD1, S_MINUS_UPWARD2}, // S_MINUS_UPWARD1 + {SPR_MNUS, 1, 1, {A_MinusCheck}, 0, S_MINUS_DOWNWARD2, S_MINUS_UPWARD3}, // S_MINUS_UPWARD2 + {SPR_MNUS, 2, 1, {A_MinusCheck}, 0, S_MINUS_DOWNWARD3, S_MINUS_UPWARD4}, // S_MINUS_UPWARD3 + {SPR_MNUS, 3, 1, {A_MinusCheck}, 0, S_MINUS_DOWNWARD4, S_MINUS_UPWARD1}, // S_MINUS_UPWARD4 + {SPR_MNUS, 4, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD2}, // S_MINUS_DOWNWARD1 + {SPR_MNUS, 5, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD3}, // S_MINUS_DOWNWARD2 + {SPR_MNUS, 6, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD4}, // S_MINUS_DOWNWARD3 + {SPR_MNUS, 7, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD1}, // S_MINUS_DOWNWARD4 {SPR_MNUD, FF_ANIMATE, 6, {NULL}, 1, 5, S_MINUSDIRT2}, // S_MINUSDIRT1 {SPR_MNUD, 5, 8, {NULL}, 3, 5, S_MINUSDIRT3}, // S_MINUSDIRT2 diff --git a/src/info.h b/src/info.h index fd9c45a1a..494276212 100644 --- a/src/info.h +++ b/src/info.h @@ -1268,18 +1268,10 @@ typedef enum state S_MINUS_UPWARD2, S_MINUS_UPWARD3, S_MINUS_UPWARD4, - S_MINUS_UPWARD5, - S_MINUS_UPWARD6, - S_MINUS_UPWARD7, - S_MINUS_UPWARD8, S_MINUS_DOWNWARD1, S_MINUS_DOWNWARD2, S_MINUS_DOWNWARD3, S_MINUS_DOWNWARD4, - S_MINUS_DOWNWARD5, - S_MINUS_DOWNWARD6, - S_MINUS_DOWNWARD7, - S_MINUS_DOWNWARD8, // Minus dirt S_MINUSDIRT1,