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

Kick bots to make room for human that want to play

Browse source
This commit is contained in:
Sally Coolatta 2024-04-10 01:50:50 -04:00 • committed by Sal
parent 96e1f1e270
commit 95fc311802
1 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/k_kart.c
View file

@ -13559,6 +13559,7 @@ void K_CheckSpectateStatus(boolean considermapreset)
{ {
UINT8 respawnlist[MAXPLAYERS]; UINT8 respawnlist[MAXPLAYERS];
UINT8 i, j, numingame = 0, numjoiners = 0; UINT8 i, j, numingame = 0, numjoiners = 0;
UINT8 numhumans = 0, numbots = 0;
// Maintain spectate wait timer // Maintain spectate wait timer
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
@ -13571,6 +13572,16 @@ void K_CheckSpectateStatus(boolean considermapreset)
if (!players[i].spectator) if (!players[i].spectator)
{ {
numingame++; numingame++;
if (players[i].bot)
{
numbots++;
}
else
{
numhumans++;
}
players[i].spectatewait = 0; players[i].spectatewait = 0;
players[i].spectatorReentry = 0; players[i].spectatorReentry = 0;
continue; continue;
@ -13600,7 +13611,7 @@ void K_CheckSpectateStatus(boolean considermapreset)
return; return;
// DON'T allow if you've hit the in-game player cap // DON'T allow if you've hit the in-game player cap
if (cv_maxplayers.value && numingame >= cv_maxplayers.value) if (cv_maxplayers.value && numhumans >= cv_maxplayers.value)
return; return;
// Get the number of players in game, and the players to be de-spectated. // Get the number of players in game, and the players to be de-spectated.
@ -13684,16 +13695,47 @@ void K_CheckSpectateStatus(boolean considermapreset)
} }
} }
const UINT8 previngame = numingame;
INT16 removeBotID = MAXPLAYERS - 1;
// Finally, we can de-spectate everyone! // Finally, we can de-spectate everyone!
for (i = 0; i < numjoiners; i++) for (i = 0; i < numjoiners; i++)
{ {
//CONS_Printf("player %s is joining on tic %d\n", player_names[respawnlist[i]], leveltime);
P_SpectatorJoinGame(&players[respawnlist[i]]);
// Hit the in-game player cap while adding people? // Hit the in-game player cap while adding people?
if (cv_maxplayers.value && numingame+i >= cv_maxplayers.value) if (cv_maxplayers.value && numingame >= cv_maxplayers.value)
break; {
if (numbots > 0)
{
// Find a bot to kill to make room
while (removeBotID >= 0)
{
if (playeringame[removeBotID] && players[removeBotID].bot)
{
//CONS_Printf("bot %s kicked to make room on tic %d\n", player_names[removeBotID], leveltime);
CL_RemovePlayer(removeBotID, KR_LEAVE);
numbots--;
numingame--;
break;
}
removeBotID--;
}
if (removeBotID < 0)
{
break;
}
}
else
{
break;
}
}
//CONS_Printf("player %s is joining on tic %d\n", player_names[respawnlist[i]], leveltime);
P_SpectatorJoinGame(&players[respawnlist[i]]);
numhumans++;
numingame++;
} }
if (considermapreset == false) if (considermapreset == false)
@ -13702,7 +13744,7 @@ void K_CheckSpectateStatus(boolean considermapreset)
// Reset the match when 2P joins 1P, DUEL mode // Reset the match when 2P joins 1P, DUEL mode
// Reset the match when 3P joins 1P and 2P, DUEL mode must be disabled // Reset the match when 3P joins 1P and 2P, DUEL mode must be disabled
extern consvar_t cv_debugnewchallenger; extern consvar_t cv_debugnewchallenger;
if (i > 0 && !mapreset && gamestate == GS_LEVEL && (numingame < 3 && numingame+i >= 2) && !cv_debugnewchallenger.value) if (i > 0 && !mapreset && gamestate == GS_LEVEL && (previngame < 3 && numingame >= 2) && !cv_debugnewchallenger.value)
{ {
Music_Play("comeon"); // COME ON Music_Play("comeon"); // COME ON
mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD mapreset = 3*TICRATE; // Even though only the server uses this for game logic, set for everyone for HUD