Use new pogo spring sprites, not colorized

This commit is contained in:
James R 2022-08-11 20:19:08 -07:00
parent 5ebcf86d7d
commit eafddb5a61
3 changed files with 7 additions and 7 deletions

View file

@ -391,6 +391,7 @@ char sprnames[NUMSPRITES + 1][5] =
"SPHR", // Red Horizontal Spring "SPHR", // Red Horizontal Spring
"SPHB", // Blue Horizontal Spring "SPHB", // Blue Horizontal Spring
"SPHG", // Grey Horizontal Spring "SPHG", // Grey Horizontal Spring
"POGS", // Pogo Spring
"BSTY", // Yellow Booster "BSTY", // Yellow Booster
"BSTR", // Red Booster "BSTR", // Red Booster
@ -3073,11 +3074,11 @@ state_t states[NUMSTATES] =
{SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4 {SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4
// Orange Spring (Pogo) // Orange Spring (Pogo)
{SPR_SPVB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1 {SPR_POGS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1
{SPR_SPVB, 1, 1, {A_Pain}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2 {SPR_POGS, 1, 2, {A_Pain}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2
{SPR_SPVB, 1, 1, {A_PlaySeeSound}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2B {SPR_POGS, 1, 2, {A_PlaySeeSound}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2B
{SPR_SPVB, 0, 1, {NULL}, 0, 0, S_POGOSPRING4}, // S_POGOSPRING3 {SPR_POGS, 0, 1, {NULL}, 0, 0, S_POGOSPRING4}, // S_POGOSPRING3
{SPR_SPVB, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4 {SPR_POGS, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4
// Yellow Diagonal Spring // Yellow Diagonal Spring
{SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1 {SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1

View file

@ -937,6 +937,7 @@ typedef enum sprite
SPR_SPHR, // Red Horizontal Spring SPR_SPHR, // Red Horizontal Spring
SPR_SPHB, // Blue Horizontal Spring SPR_SPHB, // Blue Horizontal Spring
SPR_SPHG, // Grey Horizontal Spring SPR_SPHG, // Grey Horizontal Spring
SPR_POGS, // Pogo Spring
SPR_BSTY, // Yellow Booster SPR_BSTY, // Yellow Booster
SPR_BSTR, // Red Booster SPR_BSTR, // Red Booster

View file

@ -10016,8 +10016,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break; break;
case MT_POGOSPRING: case MT_POGOSPRING:
P_SetScale(mobj, (mobj->destscale = 3 * mobj->destscale / 2)); P_SetScale(mobj, (mobj->destscale = 3 * mobj->destscale / 2));
mobj->color = SKINCOLOR_SUNSLAM;
mobj->colorized = true;
break; break;
case MT_KART_LEFTOVER: case MT_KART_LEFTOVER:
mobj->color = SKINCOLOR_RED; mobj->color = SKINCOLOR_RED;