commit 42dca84eea91a2aed60f56c9977a3a9b74fff439
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Jan 8 18:13:33 2006 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Jan 8 18:13:33 2006 +0000
show_endoom config file option to disable the endoom screen
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 274
---
src/i_system.c | 16 ++++++++++++----
src/m_misc.c | 10 ++++++++--
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/i_system.c b/src/i_system.c
index ad40d532..739e57d0 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: i_system.c 234 2005-12-30 18:50:53Z fraggle $
+// $Id: i_system.c 274 2006-01-08 18:13:33Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.16 2006/01/08 18:13:32 fraggle
+// show_endoom config file option to disable the endoom screen
+//
// Revision 1.15 2005/12/30 18:50:53 fraggle
// Millisecond clock function
//
@@ -75,7 +78,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: i_system.c 234 2005-12-30 18:50:53Z fraggle $";
+rcsid[] = "$Id: i_system.c 274 2006-01-08 18:13:33Z fraggle $";
#include <stdlib.h>
@@ -102,7 +105,7 @@ rcsid[] = "$Id: i_system.c 234 2005-12-30 18:50:53Z fraggle $";
int mb_used = 6;
-
+int show_endoom = 1;
void
I_Tactile
@@ -261,7 +264,12 @@ void I_Quit (void)
I_ShutdownMusic();
M_SaveDefaults ();
I_ShutdownGraphics();
- I_Endoom();
+
+ if (show_endoom)
+ {
+ I_Endoom();
+ }
+
exit(0);
}
diff --git a/src/m_misc.c b/src/m_misc.c
index 4af77c05..17e5c787 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: m_misc.c 202 2005-10-16 01:18:10Z fraggle $
+// $Id: m_misc.c 274 2006-01-08 18:13:33Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -23,6 +23,9 @@
//
//
// $Log$
+// Revision 1.14 2006/01/08 18:13:33 fraggle
+// show_endoom config file option to disable the endoom screen
+//
// Revision 1.13 2005/10/16 01:18:10 fraggle
// Global "configdir" variable with directory to store config files in.
// Create a function to find the filename for a savegame slot. Store
@@ -83,7 +86,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: m_misc.c 202 2005-10-16 01:18:10Z fraggle $";
+rcsid[] = "$Id: m_misc.c 274 2006-01-08 18:13:33Z fraggle $";
#include <stdio.h>
#include <stdlib.h>
@@ -269,6 +272,8 @@ extern int numChannels;
extern char* chat_macros[];
+extern int show_endoom;
+
// dos specific options: these are unused but should be maintained
// so that the config file can be shared between chocolate
// doom and doom.exe
@@ -372,6 +377,7 @@ static default_t extra_defaults_list[] =
{"screenmultiply", &screenmultiply},
{"novert", &novert},
{"mouse_acceleration", &mouse_acceleration, DEFAULT_FLOAT},
+ {"show_endoom", &show_endoom},
};
static default_collection_t extra_defaults =