adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not hang when there's a reset during the game due to sync loss.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2574 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-12-06 23:31:21 +00:00
parent 8a0ba77f24
commit 187d2084a7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/battle.c
+3 -1
View File
@@ -285,10 +285,12 @@ DoBattle (BATTLE_STATE *bs)
&& (battleFrameCount - delay) % NETPLAY_CHECKSUM_INTERVAL == 0) && (battleFrameCount - delay) % NETPLAY_CHECKSUM_INTERVAL == 0)
{ {
if (!(GLOBAL (CurrentActivity) & CHECK_ABORT)) if (!(GLOBAL (CurrentActivity) & CHECK_ABORT))
{
if (!verifyChecksums (battleFrameCount - delay)) { if (!verifyChecksums (battleFrameCount - delay)) {
GLOBAL(CurrentActivity) |= CHECK_ABORT; GLOBAL(CurrentActivity) |= CHECK_ABORT;
resetConnections(ResetReason_syncLoss); resetConnections (ResetReason_syncLoss);
} }
}
} }
} }
#endif #endif
sc2/src/sc2code/netplay/netmelee.c
+3
View File
@@ -301,6 +301,9 @@ networkBattleInput(COUNT player, STARSHIPPTR StarShipPtr) {
return (BATTLE_INPUT_STATE) 0; return (BATTLE_INPUT_STATE) 0;
} }
if (GLOBAL(CurrentActivity) & CHECK_ABORT)
return (BATTLE_INPUT_STATE) 0;
#if 0 #if 0
log_add(log_Warning, "NETPLAY: [%d] stalling for " log_add(log_Warning, "NETPLAY: [%d] stalling for "
"network input. Increase the input delay if this " "network input. Increase the input delay if this "