thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +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

4
src/g_game.c
View file

@ -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;

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)