diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/d_loop.c | 27 |
2 files changed, 21 insertions, 9 deletions
@@ -31,6 +31,9 @@ considered GPL3. Bug fixes: + * A long-standing bug that could cause every display frame to be + rendered twice was fixed (thanks Linguica, Harha, Alexandre- + Xavier). * Lots of endianness fixes were integrated that were found by Ronald Lasmanowicz during development of his Wii port of Chocolate Doom, including a fix for a bug that could cause diff --git a/src/d_loop.c b/src/d_loop.c index e7be7b30..ad9d4a41 100644 --- a/src/d_loop.c +++ b/src/d_loop.c @@ -48,6 +48,12 @@ typedef struct boolean ingame[NET_MAXPLAYERS]; } ticcmd_set_t; +// Maximum time that we wait in TryRunTics() for netgame data to be +// received before we bail out and render a frame anyway. +// Vanilla Doom used 20 for this value, but we use a smaller value +// instead for better responsiveness of the menu when we're stuck. +#define MAX_NETGAME_STALL_TICS 5 + // // gametic is the tic about to (or currently being) run // maketic is the tic that hasn't had control made for it yet @@ -746,7 +752,6 @@ void TryRunTics (void) counts = 1; // wait for new tics if needed - while (!PlayersInGame() || lowtic < gametic/ticdup + counts) { NetUpdate (); @@ -756,15 +761,19 @@ void TryRunTics (void) if (lowtic < gametic/ticdup) I_Error ("TryRunTics: lowtic < gametic"); - // Don't stay in this loop forever. The menu is still running, - // so return to update the screen - - if (I_GetTime() / ticdup - entertic > 0) - { - return; - } + // Still no tics to run? Sleep until some are available. + if (lowtic < gametic/ticdup + counts) + { + // If we're in a netgame, we might spin forever waiting for + // new network data to be received. So don't stay in here + // forever - give the menu a chance to work. + if (I_GetTime() / ticdup - entertic >= MAX_NETGAME_STALL_TICS) + { + return; + } - I_Sleep(1); + I_Sleep(1); + } } // run the count * ticdup dics |