summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2006-09-16 00:04:59 +0000
committerSimon Howard2006-09-16 00:04:59 +0000
commit87049965fc8c5633a144c1925c9da952f1a7e53a (patch)
treec1842b524e020cf2c35cb02b285fc9573048d8f0
parentd74844c6c12f8dacfd13cfd2934bdae0fb28601b (diff)
downloadchocolate-doom-87049965fc8c5633a144c1925c9da952f1a7e53a.tar.gz
chocolate-doom-87049965fc8c5633a144c1925c9da952f1a7e53a.tar.bz2
chocolate-doom-87049965fc8c5633a144c1925c9da952f1a7e53a.zip
Preserve 'comport' variable in configuration files even though it is unused.
Add 'showmessages' which is a duplicate of 'show_messages' but is how Vanilla Doom behaves! Subversion-branch: /trunk/chocolate-doom Subversion-revision: 607
-rw-r--r--src/m_misc.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/m_misc.c b/src/m_misc.c
index 1c6a8c8f..dbd0a9ee 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: m_misc.c 606 2006-09-15 23:47:12Z fraggle $
+// $Id: m_misc.c 607 2006-09-16 00:04:59Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -106,7 +106,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: m_misc.c 606 2006-09-15 23:47:12Z fraggle $";
+rcsid[] = "$Id: m_misc.c 607 2006-09-16 00:04:59Z fraggle $";
#include <stdio.h>
#include <stdlib.h>
@@ -293,12 +293,14 @@ extern int show_endoom;
extern int vanilla_savegame_limit;
extern int vanilla_demo_limit;
+int snd_musicdevice = 0;
+int snd_sfxdevice = 0;
+
// dos specific options: these are unused but should be maintained
// so that the config file can be shared between chocolate
// doom and doom.exe
-int snd_musicdevice = 0;
-int snd_sfxdevice = 0;
+static int comport = 1;
static int snd_sbport = 0;
static int snd_sbirq = 0;
static int snd_sbdma = 0;
@@ -360,6 +362,12 @@ static default_t doom_defaults_list[] =
{"screenblocks",&screenblocks},
{"detaillevel",&detailLevel},
+ // 'showmessages' is a duplicate of 'show_messages' but this is
+ // what Vanilla Doom does!
+
+ {"showmessages", &showMessages},
+ {"comport", &comport},
+
{"snd_channels",&numChannels},
{"snd_musicdevice", &snd_musicdevice},