diff --git a/src/dehacked.c b/src/dehacked.c index 0bdf43324..d8a3f6d01 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6585,7 +6585,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_DRIFTEXPLODE2", "S_DRIFTEXPLODE3", "S_DRIFTEXPLODE4", - "S_DRIFTEXPLODE5", // Sneaker boost effect "S_BOOSTFLAME", diff --git a/src/info.c b/src/info.c index 6a5c93ce1..ca367fa75 100644 --- a/src/info.c +++ b/src/info.c @@ -2563,8 +2563,7 @@ state_t states[NUMSTATES] = {SPR_DBOS, FF_FULLBRIGHT, 2, {NULL}, 6, 1, S_DRIFTEXPLODE2}, // S_DRIFTEXPLODE1 {SPR_DBOS, FF_FULLBRIGHT|1, 2, {NULL}, 6, 1, S_DRIFTEXPLODE3}, // S_DRIFTEXPLODE2 {SPR_DBOS, FF_FULLBRIGHT|2, 2, {NULL}, 6, 1, S_DRIFTEXPLODE4}, // S_DRIFTEXPLODE3 - {SPR_DBOS, FF_FULLBRIGHT|3, 2, {NULL}, 6, 1, S_DRIFTEXPLODE5}, // S_DRIFTEXPLODE4 - {SPR_DBOS, FF_FULLBRIGHT|4, 2, {NULL}, 6, 1, S_DRIFTEXPLODE1}, // S_DRIFTEXPLODE5 + {SPR_DBOS, FF_FULLBRIGHT|3, 2, {NULL}, 6, 1, S_DRIFTEXPLODE1}, // S_DRIFTEXPLODE4 {SPR_BOST, FF_FULLBRIGHT|FF_ANIMATE, TICRATE, {NULL}, 6, 1, S_BOOSTSMOKESPAWNER}, // S_BOOSTFLAME {SPR_NULL, 0, TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_BOOSTSMOKESPAWNER diff --git a/src/info.h b/src/info.h index 27ec301a7..c79f2ae5e 100644 --- a/src/info.h +++ b/src/info.h @@ -3246,7 +3246,6 @@ typedef enum state S_DRIFTEXPLODE2, S_DRIFTEXPLODE3, S_DRIFTEXPLODE4, - S_DRIFTEXPLODE5, // Sneaker boost effect S_BOOSTFLAME, diff --git a/src/k_kart.c b/src/k_kart.c index 8aba6cf34..d87d7f092 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6376,7 +6376,7 @@ static void K_KartDrift(player_t *player, boolean onground) player->kartstuff[k_driftboost] = 20; overlay->color = SKINCOLOR_KETCHUP; - overlay->fuse = 20; + overlay->fuse = 16; } else if (player->kartstuff[k_driftcharge] < dsthree) { @@ -6388,7 +6388,7 @@ static void K_KartDrift(player_t *player, boolean onground) player->kartstuff[k_driftboost] = 50; overlay->color = SKINCOLOR_SAPPHIRE; - overlay->fuse = 40; + overlay->fuse = 32; } else if (player->kartstuff[k_driftcharge] >= dsthree) { diff --git a/src/p_mobj.c b/src/p_mobj.c index 971990dc0..ac5b35121 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8331,11 +8331,11 @@ void P_MobjThinker(mobj_t *mobj) mobj->modeltilt = mobj->target->modeltilt; #endif - if (mobj->fuse <= 20) + if (mobj->fuse <= 16) mobj->color = SKINCOLOR_KETCHUP; - else if (mobj->fuse <= 40) + else if (mobj->fuse <= 32) mobj->color = SKINCOLOR_SAPPHIRE; - else if (mobj->fuse > 40) + else if (mobj->fuse > 32) mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); {