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

Merge branch 'fix-relaxed-ring-count' into 'master'

Browse source 
Fix EXP/Ring totals in Relaxed when finishing low

Closes ring-racers#407

See merge request kart-krew-dev/ring-racers-internal!2987
This commit is contained in:
Gunla 2025-10-31 23:41:06 +00:00
commit 438468f7e5
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/g_game.c
View file

@ -2319,7 +2319,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
UINT16 bigwaypointgap; UINT16 bigwaypointgap;
INT16 duelscore; INT16 duelscore;
boolean mfdfinish; boolean mfdfinish;
roundconditions_t roundconditions; roundconditions_t roundconditions;
@ -2415,7 +2415,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
totalring = players[player].totalring; totalring = players[player].totalring;
xtralife = players[player].xtralife; xtralife = players[player].xtralife;
mfdfinish = players[player].mfdfinish; mfdfinish = players[player].mfdfinish;
pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE|PF_AUTOROULETTE|PF_ANALOGSTICK|PF_AUTORING)); pflags = (players[player].pflags & (PF_WANTSTOJOIN|PF_KICKSTARTACCEL|PF_SHRINKME|PF_SHRINKACTIVE|PF_AUTOROULETTE|PF_ANALOGSTICK|PF_AUTORING));
@ -2687,7 +2687,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->xtralife = xtralife; p->xtralife = xtralife;
p->finalized = finalized; p->finalized = finalized;
p->mfdfinish = mfdfinish; p->mfdfinish = mfdfinish;
// SRB2kart // SRB2kart
@ -4155,7 +4155,7 @@ void G_AddMapToBuffer(UINT16 map)
{ {
mapheaderinfo[i]->justPlayed = upperJustPlayedLimit; mapheaderinfo[i]->justPlayed = upperJustPlayedLimit;
} }
if (mapheaderinfo[i]->justPlayed > 0) if (mapheaderinfo[i]->justPlayed > 0)
{ {
mapheaderinfo[i]->justPlayed--; mapheaderinfo[i]->justPlayed--;
@ -4894,14 +4894,14 @@ static void G_DoCompleted(void)
} }
} }
if (grandprixinfo.gp == true && grandprixinfo.wonround == true && player->exiting && (!retrying || grandprixinfo.gamespeed == KARTSPEED_EASY)) if (grandprixinfo.gp == true && grandprixinfo.wonround == true && player->exiting && (!retrying || !G_GametypeUsesLives()))
{ {
if (player->bot == true) if (player->bot == true)
{ {
// Bots are going to get harder... :) // Bots are going to get harder... :)
K_IncreaseBotDifficulty(player); K_IncreaseBotDifficulty(player);
} }
else if (K_IsPlayerLosing(player) == false) else if (K_IsPlayerLosing(player) == false || !G_GametypeUsesLives())
{ {
// Increase your total rings // Increase your total rings
INT32 ringtotal = player->hudrings; INT32 ringtotal = player->hudrings;
@ -5227,7 +5227,7 @@ void G_EndGame(void)
{ {
// Clean up ACS music remaps. // Clean up ACS music remaps.
Music_TuneReset(); Music_TuneReset();
// Handle voting // Handle voting
if (nextmap == NEXTMAP_VOTING) if (nextmap == NEXTMAP_VOTING)
{ {

10
src/p_inter.c
View file

@ -1636,9 +1636,6 @@ boolean P_CheckRacers(void)
boolean eliminateLast = (!K_CanChangeRules(true) || (cv_karteliminatelast.value != 0)); boolean eliminateLast = (!K_CanChangeRules(true) || (cv_karteliminatelast.value != 0));
if (grandprixinfo.gp && grandprixinfo.gamespeed == KARTSPEED_EASY)
eliminateLast = false;
boolean allHumansDone = true; boolean allHumansDone = true;
//boolean allBotsDone = true; //boolean allBotsDone = true;
@ -1701,12 +1698,14 @@ boolean P_CheckRacers(void)
#ifndef DEVELOP #ifndef DEVELOP
else if (grandprixinfo.gp == true) else if (grandprixinfo.gp == true)
{ {
// Always do this in GP
eliminateLast = true; eliminateLast = true;
} }
#endif #endif
} }
if (grandprixinfo.gp && grandprixinfo.gamespeed == KARTSPEED_EASY)
eliminateLast = false;
if (eliminateLast == true && (numExiting >= numPlaying-1)) if (eliminateLast == true && (numExiting >= numPlaying-1))
{ {
// Everyone's done playing but one guy apparently. // Everyone's done playing but one guy apparently.
@ -1769,6 +1768,9 @@ boolean P_CheckRacers(void)
} }
} }
if (grandprixinfo.gp && !G_GametypeUsesLives()) // Relaxed
racecountdown = 0;
// We're still playing, but no one else is, // We're still playing, but no one else is,
// so we need to reset spectator griefing. // so we need to reset spectator griefing.
if (numPlaying <= 1) if (numPlaying <= 1)