From eafddb5a61b17d0ae01f97c40fb8324f0208b583 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 11 Aug 2022 20:19:08 -0700 Subject: [PATCH] Use new pogo spring sprites, not colorized --- src/info.c | 11 ++++++----- src/info.h | 1 + src/p_mobj.c | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/info.c b/src/info.c index 378a7ddd8..db656a3a7 100644 --- a/src/info.c +++ b/src/info.c @@ -391,6 +391,7 @@ char sprnames[NUMSPRITES + 1][5] = "SPHR", // Red Horizontal Spring "SPHB", // Blue Horizontal Spring "SPHG", // Grey Horizontal Spring + "POGS", // Pogo Spring "BSTY", // Yellow Booster "BSTR", // Red Booster @@ -3073,11 +3074,11 @@ state_t states[NUMSTATES] = {SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4 // Orange Spring (Pogo) - {SPR_SPVB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1 - {SPR_SPVB, 1, 1, {A_Pain}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2 - {SPR_SPVB, 1, 1, {A_PlaySeeSound}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2B - {SPR_SPVB, 0, 1, {NULL}, 0, 0, S_POGOSPRING4}, // S_POGOSPRING3 - {SPR_SPVB, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4 + {SPR_POGS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1 + {SPR_POGS, 1, 2, {A_Pain}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2 + {SPR_POGS, 1, 2, {A_PlaySeeSound}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2B + {SPR_POGS, 0, 1, {NULL}, 0, 0, S_POGOSPRING4}, // S_POGOSPRING3 + {SPR_POGS, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4 // Yellow Diagonal Spring {SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1 diff --git a/src/info.h b/src/info.h index a0447fd03..4a490ba9f 100644 --- a/src/info.h +++ b/src/info.h @@ -937,6 +937,7 @@ typedef enum sprite SPR_SPHR, // Red Horizontal Spring SPR_SPHB, // Blue Horizontal Spring SPR_SPHG, // Grey Horizontal Spring + SPR_POGS, // Pogo Spring SPR_BSTY, // Yellow Booster SPR_BSTR, // Red Booster diff --git a/src/p_mobj.c b/src/p_mobj.c index e6070de59..9cc77641d 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10016,8 +10016,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) break; case MT_POGOSPRING: P_SetScale(mobj, (mobj->destscale = 3 * mobj->destscale / 2)); - mobj->color = SKINCOLOR_SUNSLAM; - mobj->colorized = true; break; case MT_KART_LEFTOVER: mobj->color = SKINCOLOR_RED;