diff options
| author | Simon Howard | 2006-09-25 20:47:11 +0000 |
|---|---|---|
| committer | Simon Howard | 2006-09-25 20:47:11 +0000 |
| commit | cb9ca4fc2637443d9ec38060d43b73a47649f452 (patch) | |
| tree | 1efa22bc569759f7f520da6276e36898ebccd02f /src/d_main.c | |
| parent | 49474b14d45c37b05e0ab3594c5cc905bcdb14e3 (diff) | |
| download | chocolate-doom-cb9ca4fc2637443d9ec38060d43b73a47649f452.tar.gz chocolate-doom-cb9ca4fc2637443d9ec38060d43b73a47649f452.tar.bz2 chocolate-doom-cb9ca4fc2637443d9ec38060d43b73a47649f452.zip | |
Don't disable screen melt entirely in testcontrols mode; just on startup.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 666
Diffstat (limited to 'src/d_main.c')
| -rw-r--r-- | src/d_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/d_main.c b/src/d_main.c index a23be747..e2c88e45 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: d_main.c 662 2006-09-25 18:04:29Z fraggle $ +// $Id: d_main.c 666 2006-09-25 20:47:11Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -184,7 +184,7 @@ //----------------------------------------------------------------------------- -static const char rcsid[] = "$Id: d_main.c 662 2006-09-25 18:04:29Z fraggle $"; +static const char rcsid[] = "$Id: d_main.c 666 2006-09-25 20:47:11Z fraggle $"; #define BGCOLOR 7 #define FGCOLOR 8 @@ -530,7 +530,7 @@ void D_Display (void) // normal update - if (!wipe || testcontrols) + if (!wipe) { I_FinishUpdate (); // page flip or blit buffer return; @@ -587,6 +587,11 @@ void D_DoomLoop (void) D_StartGameLoop(); + if (testcontrols) + { + wipegamestate = gamestate; + } + while (1) { // frame syncronous IO operations |