zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-28 06:02:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: This hopefully resolves issues with leaving multiplayer games

Browse source
This commit is contained in:
NY00123 2020-04-14 19:09:56 +03:00 committed by Christoph Oelckers
parent 7749b0f7b9
commit 0f761cdc77
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/sw/src/network.cpp
View file

@ -696,6 +696,17 @@ SWBOOL MyCommPlayerQuit(void)
{ {
if (TEST_SYNC_KEY(Player + i, SK_QUIT_GAME)) if (TEST_SYNC_KEY(Player + i, SK_QUIT_GAME))
{ {
if (!NetBroadcastMode && i == connecthead)
{
// If it's the master, it should first send quit message to the slaves.
// Each slave should automatically quit after receiving the message.
if (i == myconnectindex)
continue;
QuitFlag = TRUE;
ready2send = 0;
return TRUE;
}
found = TRUE; found = TRUE;
quit_player_index = i; quit_player_index = i;
@ -980,10 +991,6 @@ faketimerhandler(void)
memset(&AveragePacket, 0, sizeof(AveragePacket)); memset(&AveragePacket, 0, sizeof(AveragePacket));
// Slave won't receive the quit bit back from the master, so handle it separately
if (TEST(loc.bits, 1 << SK_QUIT_GAME) && !NetBroadcastMode && (myconnectindex != connecthead))
QuitFlag = TRUE;
pp->inputfifo[Player[myconnectindex].movefifoend & (MOVEFIFOSIZ - 1)] = loc; pp->inputfifo[Player[myconnectindex].movefifoend & (MOVEFIFOSIZ - 1)] = loc;
pp->movefifoend++; pp->movefifoend++;
Bmemset(&loc, 0, sizeof(loc)); Bmemset(&loc, 0, sizeof(loc));
@ -1048,6 +1055,15 @@ faketimerhandler(void)
bufferjitter -= ((2 - i) >> 2); bufferjitter -= ((2 - i) >> 2);
} }
// If this isn't the master, and the player decided to quit, leave
// the game after sending the message. Otherwise, before processing
// local message with SK_QUIT bit, we may wait in MoveLoop for another
// message with input from one of the peers, only to never get any,
// as the peer in question already removed this player from its list.
if ((NetBroadcastMode || (myconnectindex != connecthead)) &&
TEST(pp->inputfifo[(pp->movefifoend - 1) & (MOVEFIFOSIZ - 1)].bits, BIT(SK_QUIT_GAME)))
QuitFlag = TRUE;
if (NetBroadcastMode) if (NetBroadcastMode)
{ {
packbuf[0] = PACKET_TYPE_BROADCAST; packbuf[0] = PACKET_TYPE_BROADCAST;
@ -1230,6 +1246,9 @@ faketimerhandler(void)
playerquitflag[i] = 1; playerquitflag[i] = 1;
*/ */
} }
// Master player should quit only after notifying all peers
if (TEST(Player[myconnectindex].inputfifo[movefifosendplc & (MOVEFIFOSIZ - 1)].bits, BIT(SK_QUIT_GAME)))
QuitFlag = TRUE;
movefifosendplc += MovesPerPacket; movefifosendplc += MovesPerPacket;
} }