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

Merge branch 'fix-intermission-parties' into 'master'

Browse source 
Fix Party management breaking during Intermission and Vote

Closes #499

See merge request KartKrew/Kart!1903
This commit is contained in:
Oni 2024-02-03 19:41:57 +00:00
commit d755d83778
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -1856,7 +1856,7 @@ Command_Invite_f (void)
return; return;
} }
if (r_splitscreen >= MAXSPLITSCREENPLAYERS) if (G_PartySize(consoleplayer) >= MAXSPLITSCREENPLAYERS)
{ {
CONS_Alert(CONS_WARNING, "Your party is full!\n"); CONS_Alert(CONS_WARNING, "Your party is full!\n");
return; return;
@ -1983,7 +1983,7 @@ Command_RejectInvite_f (void)
static void static void
Command_LeaveParty_f (void) Command_LeaveParty_f (void)
{ {
if (r_splitscreen > splitscreen) if (G_PartySize(consoleplayer) > G_LocalSplitscreenPartySize(consoleplayer))
{ {
CONS_Printf("\x85Leaving party...\n"); CONS_Printf("\x85Leaving party...\n");

13
src/g_party.cpp
View file

@ -128,16 +128,15 @@ public:
return; return;
} }
// Rendering stuff is not valid outside of levels.
if (!G_GamestateUsesLevel())
{
return;
}
for (std::size_t i = 0; i < size(); ++i) for (std::size_t i = 0; i < size(); ++i)
{ {
displayplayers[i] = at(i); displayplayers[i] = at(i);
G_FixCamera(1 + i);
// Camera is not valid outside of levels.
if (G_GamestateUsesLevel())
{
G_FixCamera(1 + i);
}
} }
r_splitscreen = size() - 1; r_splitscreen = size() - 1;