commit cb9ca4fc2637443d9ec38060d43b73a47649f452
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Sep 25 20:47:11 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Sep 25 20:47:11 2006 +0000
Don't disable screen melt entirely in testcontrols mode; just on startup.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 666
---
src/d_main.c | 11 ++++++++---
1 file 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