From 01a403802ecc6465a0dec05b52b3d179732bb7c7 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 13 Jan 2006 18:23:28 +0000 Subject: Textscreen getchar() function; remove SDL code from I_Endoom. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 289 --- src/i_system.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) (limited to 'src/i_system.c') diff --git a/src/i_system.c b/src/i_system.c index 739e57d0..0a915b38 100644 --- a/src/i_system.c +++ b/src/i_system.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: i_system.c 274 2006-01-08 18:13:33Z fraggle $ +// $Id: i_system.c 289 2006-01-13 18:23:28Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,9 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.17 2006/01/13 18:23:27 fraggle +// Textscreen getchar() function; remove SDL code from I_Endoom. +// // Revision 1.16 2006/01/08 18:13:32 fraggle // show_endoom config file option to disable the endoom screen // @@ -78,7 +81,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: i_system.c 274 2006-01-08 18:13:33Z fraggle $"; +rcsid[] = "$Id: i_system.c 289 2006-01-13 18:23:28Z fraggle $"; #include @@ -203,10 +206,9 @@ void I_Endoom(void) unsigned char *screendata; unsigned int start_ms; boolean waiting; - SDL_Event ev; endoom_data = W_CacheLumpName("ENDOOM", PU_STATIC); - + // Set up text mode screen TXT_Init(); @@ -230,23 +232,12 @@ void I_Endoom(void) { TXT_UpdateScreen(); - if (!SDL_PollEvent(&ev)) + if (TXT_GetChar() >= 0) { - I_Sleep(50); - continue; - } - - switch (ev.type) - { - case SDL_QUIT: - case SDL_MOUSEBUTTONDOWN: - case SDL_KEYDOWN: - waiting = false; - break; - - default: - break; + break; } + + I_Sleep(50); } // Shut down text mode screen -- cgit v1.2.3