thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-07 15:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bot-raid' into 'master'

Browse source 
Fix midrace joins being impossible when bots are present

Closes ring-racers#75

See merge request kart-krew-dev/ring-racers-internal!2833
This commit is contained in:
Oni VelocitOni 2025-09-14 22:28:51 +00:00
commit 38c5e5568c
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_kart.c
View file

@ -16374,10 +16374,8 @@ void K_CheckSpectateStatus(boolean considermapreset)
// Mid-race joins cause all kind of jank, including replay issues
// that literally none of us can figure out. Whoops.
if (numingame < 2 || leveltime == 0)
continue;
return;
if (numhumans > 1 && leveltime != 0)
return;
// Unseal when someone feels like debugging.
#if 0
@ -16494,9 +16492,8 @@ void K_CheckSpectateStatus(boolean considermapreset)
return;
// Reset the match when 2P joins 1P, DUEL mode
// Reset the match when 3P joins 1P and 2P, DUEL mode must be disabled
extern consvar_t cv_debugnewchallenger;
if (i > 0 && !mapreset && gamestate == GS_LEVEL && (previngame < 3 && numingame >= 2) && !cv_debugnewchallenger.value)
if (i > 0 && !mapreset && gamestate == GS_LEVEL && ((previngame < 3 && numingame >= 2) || (numhumans <= 2)) && !cv_debugnewchallenger.value)
{
Music_Play("comeon"); // COME ON
mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD