ref: f0a776f06962adb498253b0e5bbdc3acbaa49864
parent: 55b0f32c737cb2781056309517c21b69d1893e3d
author: Simon Howard <[email protected]>
date: Wed Sep 7 08:34:47 EDT 2005
Maintain dos-specific options in config file Subversion-branch: /trunk/chocolate-doom Subversion-revision: 82
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: m_misc.c 39 2005-08-04 21:48:32Z fraggle $
+// $Id: m_misc.c 82 2005-09-07 12:34:47Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -23,6 +23,9 @@
//
//
// $Log$
+// Revision 1.7 2005/09/07 12:34:47 fraggle
+// Maintain dos-specific options in config file
+//
// Revision 1.6 2005/08/04 21:48:32 fraggle
// Turn on compiler optimisation and warning options
// Add SDL_mixer sound code
@@ -54,7 +57,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: m_misc.c 39 2005-08-04 21:48:32Z fraggle $";
+rcsid[] = "$Id: m_misc.c 82 2005-09-07 12:34:47Z fraggle $";
#include <sys/stat.h>
#include <sys/types.h>
@@ -238,7 +241,17 @@
extern char* chat_macros[];
+// dos specific options: these are unused but should be maintained
+// so that the config file can be shared between chocolate
+// doom and doom.exe
+static int snd_musicdevice;
+static int snd_sfxdevice;
+static int snd_sbport;
+static int snd_sbirq;
+static int snd_sbdma;
+static int snd_mport;
+
typedef struct
{char * name;
@@ -284,7 +297,12 @@
{"snd_channels",&numChannels, 3},-
+ {"snd_musicdevice", &snd_musicdevice, 0},+ {"snd_sfxdevice", &snd_sfxdevice, 0},+ {"snd_sbport", &snd_sbport, 0},+ {"snd_sbirq", &snd_sbirq, 0},+ {"snd_sbdma", &snd_sbdma, 0},+ {"snd_mport", &snd_mport, 0}, {"usegamma",&usegamma, 0},