thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-09 01:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'early-item-fix' into 'master'

Browse source 
Fix inconsistent early item behavior

Closes #1533

See merge request kart-krew-dev/ring-racers-internal!2585
This commit is contained in:
AJ Martinez 2025-05-28 04:10:34 +00:00
commit 9009a5aef9
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_game.c
View file

@ -2352,8 +2352,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
bot = players[player].bot; bot = players[player].bot;
botdifficulty = players[player].botvars.difficulty; botdifficulty = players[player].botvars.difficulty;
cangrabitems = players[player].cangrabitems;
botdiffincrease = players[player].botvars.diffincrease; botdiffincrease = players[player].botvars.diffincrease;
botrival = players[player].botvars.rival; botrival = players[player].botvars.rival;
@ -2439,13 +2437,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
tallyactive = false; tallyactive = false;
cangrabitems = 0; cangrabitems = 0;
if (gametyperules & GTR_SPHERES
|| gametyperules & GTR_CATCHER
|| G_TimeAttackStart()
|| gametype == GT_TUTORIAL
|| !M_NotFreePlay()
|| K_GetNumWaypoints() == 0)
cangrabitems = EARLY_ITEM_FLICKER;
} }
else else
{ {
@ -2501,6 +2492,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
{ {
tally = players[player].tally; tally = players[player].tally;
} }
cangrabitems = players[player].cangrabitems;
} }
spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry); spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry);

15
src/k_kart.c
View file

@ -9781,6 +9781,21 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->invincibilitytimer--; player->invincibilitytimer--;
} }
// The precise ordering of start-of-level made me want to cut my head off,
// so let's try this instead. Whatever!
if (leveltime <= introtime)
{
if ((gametyperules & GTR_SPHERES)
|| (gametyperules & GTR_CATCHER)
|| G_TimeAttackStart()
|| (gametype == GT_TUTORIAL)
|| !M_NotFreePlay()
|| (K_GetNumWaypoints() == 0))
player->cangrabitems = EARLY_ITEM_FLICKER;
else
player->cangrabitems = 0;
}
if (player->cangrabitems && player->cangrabitems <= EARLY_ITEM_FLICKER) if (player->cangrabitems && player->cangrabitems <= EARLY_ITEM_FLICKER)
player->cangrabitems++; player->cangrabitems++;