thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Who said anything about a 5th frame?

Browse source
This commit is contained in:
James R 2020-07-18 14:52:30 -07:00
parent 59c0f99865
commit 1dae3d196b
5 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -6585,7 +6585,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_DRIFTEXPLODE2", "S_DRIFTEXPLODE2",
"S_DRIFTEXPLODE3", "S_DRIFTEXPLODE3",
"S_DRIFTEXPLODE4", "S_DRIFTEXPLODE4",
"S_DRIFTEXPLODE5",
// Sneaker boost effect // Sneaker boost effect
"S_BOOSTFLAME", "S_BOOSTFLAME",

3
src/info.c
View file

@ -2563,8 +2563,7 @@ state_t states[NUMSTATES] =
{SPR_DBOS, FF_FULLBRIGHT, 2, {NULL}, 6, 1, S_DRIFTEXPLODE2}, // S_DRIFTEXPLODE1 {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|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|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|3, 2, {NULL}, 6, 1, S_DRIFTEXPLODE1}, // S_DRIFTEXPLODE4
{SPR_DBOS, FF_FULLBRIGHT|4, 2, {NULL}, 6, 1, S_DRIFTEXPLODE1}, // S_DRIFTEXPLODE5
{SPR_BOST, FF_FULLBRIGHT|FF_ANIMATE, TICRATE, {NULL}, 6, 1, S_BOOSTSMOKESPAWNER}, // S_BOOSTFLAME {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 {SPR_NULL, 0, TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_BOOSTSMOKESPAWNER

1
src/info.h
View file

@ -3246,7 +3246,6 @@ typedef enum state
S_DRIFTEXPLODE2, S_DRIFTEXPLODE2,
S_DRIFTEXPLODE3, S_DRIFTEXPLODE3,
S_DRIFTEXPLODE4, S_DRIFTEXPLODE4,
S_DRIFTEXPLODE5,
// Sneaker boost effect // Sneaker boost effect
S_BOOSTFLAME, S_BOOSTFLAME,

4
src/k_kart.c
View file

@ -6376,7 +6376,7 @@ static void K_KartDrift(player_t *player, boolean onground)
player->kartstuff[k_driftboost] = 20; player->kartstuff[k_driftboost] = 20;
overlay->color = SKINCOLOR_KETCHUP; overlay->color = SKINCOLOR_KETCHUP;
overlay->fuse = 20; overlay->fuse = 16;
} }
else if (player->kartstuff[k_driftcharge] < dsthree) 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; player->kartstuff[k_driftboost] = 50;
overlay->color = SKINCOLOR_SAPPHIRE; overlay->color = SKINCOLOR_SAPPHIRE;
overlay->fuse = 40; overlay->fuse = 32;
} }
else if (player->kartstuff[k_driftcharge] >= dsthree) else if (player->kartstuff[k_driftcharge] >= dsthree)
{ {

6
src/p_mobj.c
View file

@ -8331,11 +8331,11 @@ void P_MobjThinker(mobj_t *mobj)
mobj->modeltilt = mobj->target->modeltilt; mobj->modeltilt = mobj->target->modeltilt;
#endif #endif
if (mobj->fuse <= 20) if (mobj->fuse <= 16)
mobj->color = SKINCOLOR_KETCHUP; mobj->color = SKINCOLOR_KETCHUP;
else if (mobj->fuse <= 40) else if (mobj->fuse <= 32)
mobj->color = SKINCOLOR_SAPPHIRE; mobj->color = SKINCOLOR_SAPPHIRE;
else if (mobj->fuse > 40) else if (mobj->fuse > 32)
mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
{ {