zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SW: This is a better place for a slave which quits to set QuitFlag

This commit is contained in:
NY00123 2020-04-11 12:39:27 +03:00 committed by Christoph Oelckers
parent d50410f06b
commit 6d9c657b11
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/sw/src/network.cpp
View File

@ -74,6 +74,7 @@ extern SWBOOL PauseKeySet;
gNET gNet; gNET gNet;
extern short PlayerQuitMenuLevel; extern short PlayerQuitMenuLevel;
extern SWBOOL QuitFlag;
#define TIMERUPDATESIZ 32 #define TIMERUPDATESIZ 32
@ -688,7 +689,6 @@ SWBOOL MyCommPlayerQuit(void)
PLAYERp pp; PLAYERp pp;
short i; short i;
short prev_player = 0; short prev_player = 0;
extern SWBOOL QuitFlag;
short found = FALSE; short found = FALSE;
short quit_player_index = 0; short quit_player_index = 0;
@ -980,6 +980,10 @@ 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));