shithub: choc

Download patch

ref: 93f55e498b63ac4da63d9190061b188db1c6c225
parent: 18037f65dcc82db1975e0473a7e198b37db05ed2
author: Simon Howard <[email protected]>
date: Sun Sep 17 13:01:33 EDT 2006

Always wait for a keypress before closing the ENDOOM window; do not 
close it automatically.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 610

--- a/src/i_system.c
+++ b/src/i_system.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_system.c 579 2006-08-31 18:12:25Z fraggle $
+// $Id: i_system.c 610 2006-09-17 17:01:33Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -81,7 +81,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: i_system.c 579 2006-08-31 18:12:25Z fraggle $";
+rcsid[] = "$Id: i_system.c 610 2006-09-17 17:01:33Z fraggle $";
 
 
 #include <stdlib.h>
@@ -177,8 +177,6 @@
 {
     unsigned char *endoom_data;
     unsigned char *screendata;
-    unsigned int start_ms;
-    boolean waiting;
 
     endoom_data = W_CacheLumpName("ENDOOM", PU_STATIC);
 
@@ -196,12 +194,9 @@
     screendata = TXT_GetScreenData();
     memcpy(screendata, endoom_data, 4000);
 
-    // Wait for 10 seconds, or until a keypress or mouse click
+    // Wait for a keypress
 
-    waiting = true;
-    start_ms = I_GetTime();
-
-    while (waiting && I_GetTime() < start_ms + 350)
+    while (true)
     {
         TXT_UpdateScreen();