thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove player from old party when directly joining another

Browse source
This commit is contained in:
James R 2023-03-26 03:59:13 -07:00 • committed by toaster
parent dfe49a5bf3
commit 0774cd2c80
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/g_party.cpp
View file

@ -223,30 +223,39 @@ public:
pool_[other].add(local_party[guest]); pool_[other].add(local_party[guest]);
} }
pool_[guest] = party; reset(guest, party); // assign new party to guest
party.rebuild_displayplayers();
return true; return true;
} }
// Removes player from another party and restores their // Removes a player from another party and assigns a new
// local splitscreen party. Viewports are updated for // party. Viewports are updated for all players involved.
// every player involved. void reset(Party::Console player, const Party &party)
void leave(Party::Console player) {
SRB2_ASSERT(party.size() > 0);
remove(player);
pool_[player] = party;
party.rebuild_displayplayers();
}
private:
// Removes a player from every party they're in. Updates
// viewports for the players left behind.
void remove(Party::Console player)
{ {
Party &party = pool_[player]; Party &party = pool_[player];
// Iterate a COPY of party because this very party // Iterate a COPY of party because this very party
// could be modified. // will be modified.
for (Party::Console member : Party(party)) for (Party::Console member : Party(party))
{ {
pool_[member].remove(player); pool_[member].remove(player);
} }
party.rebuild_displayplayers(); // restore viewports for left behind party party.rebuild_displayplayers(); // restore viewports for left behind party
party = local_party[player];
party.rebuild_displayplayers(); // restore local viewports
} }
} }
final_party; final_party;
@ -280,7 +289,7 @@ void G_JoinParty(UINT8 host, UINT8 guest)
void G_LeaveParty(UINT8 player) void G_LeaveParty(UINT8 player)
{ {
final_party.leave(player); final_party.reset(player, local_party[player]);
} }
UINT8 G_LocalSplitscreenPartySize(UINT8 player) UINT8 G_LocalSplitscreenPartySize(UINT8 player)