stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move sphere redistribution to its own function

Browse source
This commit is contained in:
LJ Sonic 2022-12-29 21:28:53 +01:00
parent ecacb14fc1
commit 2de6b623c0
1 changed files with 56 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/d_clisrv.c
View file

@ -2316,6 +2316,61 @@ static void UnlinkPlayerFromNode(INT32 playernum)
}
}
// If in a special stage, redistribute the player's
// spheres across the remaining players.
// I feel like this shouldn't even be in this file at all, but well.
static void RedistributeSpecialStageSpheres(INT32 playernum)
{
INT32 i, count, sincrement, spheres, rincrement, rings;
if (!G_IsSpecialStage(gamemap))
return;
for (i = 0, count = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
count++;
}
count--;
sincrement = spheres = players[playernum].spheres;
rincrement = rings = players[playernum].rings;
if (count)
{
sincrement /= count;
rincrement /= count;
}
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && i != playernum)
{
if (spheres < 2*sincrement)
{
P_GivePlayerSpheres(&players[i], spheres);
spheres = 0;
}
else
{
P_GivePlayerSpheres(&players[i], sincrement);
spheres -= sincrement;
}
if (rings < 2*rincrement)
{
P_GivePlayerRings(&players[i], rings);
rings = 0;
}
else
{
P_GivePlayerRings(&players[i], rincrement);
rings -= rincrement;
}
}
}
}
//
// CL_RemovePlayer
//
@ -2334,56 +2389,7 @@ void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
if (gametyperules & GTR_TEAMFLAGS)
P_PlayerFlagBurst(&players[playernum], false); // Don't take the flag with you!
// If in a special stage, redistribute the player's spheres across
// the remaining players.
if (G_IsSpecialStage(gamemap))
{
INT32 i, count, sincrement, spheres, rincrement, rings;
for (i = 0, count = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
count++;
}
count--;
sincrement = spheres = players[playernum].spheres;
rincrement = rings = players[playernum].rings;
if (count)
{
sincrement /= count;
rincrement /= count;
}
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && i != playernum)
{
if (spheres < 2*sincrement)
{
P_GivePlayerSpheres(&players[i], spheres);
spheres = 0;
}
else
{
P_GivePlayerSpheres(&players[i], sincrement);
spheres -= sincrement;
}
if (rings < 2*rincrement)
{
P_GivePlayerRings(&players[i], rings);
rings = 0;
}
else
{
P_GivePlayerRings(&players[i], rincrement);
rings -= rincrement;
}
}
}
}
RedistributeSpecialStageSpheres(playernum);
LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting