(svn r21308) -Fix [FS#4262] (r20933-ish): crash upon desync

This commit is contained in:
rubidium 2010-11-23 23:59:24 +00:00
parent e0432a4585
commit bb02e30a37
1 changed files with 6 additions and 2 deletions

View File

@ -927,12 +927,16 @@ void NetworkGameLoop()
/* Make sure we are at the frame were the server is (quick-frames) */
if (_frame_counter_server > _frame_counter) {
/* Run a number of frames; when things go bad, get out. */
while (_frame_counter_server > _frame_counter) {
if (!ClientNetworkGameSocketHandler::GameLoop()) break;
if (!ClientNetworkGameSocketHandler::GameLoop()) return;
}
} else {
/* Else, keep on going till _frame_counter_max */
if (_frame_counter_max > _frame_counter) ClientNetworkGameSocketHandler::GameLoop();
if (_frame_counter_max > _frame_counter) {
/* Run one frame; if things went bad, get out. */
if (!ClientNetworkGameSocketHandler::GameLoop()) return;
}
}
}