Split out configuration file code from m_misc.c into m_config.c. Move

screenshot code into v_video.c Add M_FileLength common function for
finding the length of an open file.

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

13 files changed, 1265 insertions, 1254 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4358d6e2..8c69a161 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ d_dedicated.c                              \
 i_main.c                                   \
 i_timer.c            i_timer.h             \
 m_argv.c             m_argv.h              \
+m_misc.c             m_misc.h              \
 net_common.c         net_common.h          \
 net_dedicated.c      net_dedicated.h       \
 net_io.c             net_io.h              \
@@ -57,6 +58,7 @@ i_video.c            i_video.h             \
 m_argv.c             m_argv.h              \
 m_bbox.c             m_bbox.h              \
 m_cheat.c            m_cheat.h             \
+m_config.c           m_config.h            \
 m_fixed.c            m_fixed.h             \
 m_menu.c             m_menu.h              \
 m_misc.c             m_misc.h              \
diff --git a/src/d_iwad.c b/src/d_iwad.c
index fa25f9b0..d54ad915 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -34,6 +34,7 @@
 #include "doomstat.h"
 #include "i_system.h"
 #include "m_argv.h"
+#include "m_config.h"
 #include "m_misc.h"
 #include "w_wad.h"
 #include "z_zone.h"
diff --git a/src/d_main.c b/src/d_main.c
index 5b78df60..c0d37fdc 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -54,6 +54,7 @@
 #include "f_wipe.h"
 
 #include "m_argv.h"
+#include "m_config.h"
 #include "m_misc.h"
 #include "m_menu.h"
 #include "p_saveg.h"
diff --git a/src/g_game.c b/src/g_game.c
index 90f707ef..c9e3879f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -847,7 +847,8 @@ void G_Ticker (void)
 	    G_DoWorldDone (); 
 	    break; 
 	  case ga_screenshot: 
-	    M_ScreenShot (); 
+	    V_ScreenShot (); 
+            players[consoleplayer].message = DEH_String("screen shot");
 	    gameaction = ga_nothing; 
 	    break; 
 	  case ga_nothing: 
diff --git a/src/i_system.c b/src/i_system.c
index 79fc711e..09e211fd 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -42,6 +42,7 @@
 #include "doomdef.h"
 #include "doomstat.h"
 #include "m_argv.h"
+#include "m_config.h"
 #include "m_misc.h"
 #include "i_joystick.h"
 #include "i_timer.h"
diff --git a/src/m_argv.c b/src/m_argv.c
index 509a0b87..78404d35 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -31,6 +31,7 @@
 
 #include "doomdef.h"
 #include "i_system.h"
+#include "m_misc.h"
 
 int		myargc;
 char**		myargv;
@@ -44,6 +45,8 @@ char**		myargv;
 // in the program's command line arguments.
 // Returns the argument number (1 to argc-1)
 // or 0 if not present
+//
+
 int M_CheckParm (char *check)
 {
     int		i;
@@ -83,11 +86,7 @@ static void LoadResponseFile(int argv_index)
 
     printf("Found response file %s!\n", response_filename);
 
-    // Find size of file
-
-    fseek(handle, 0, SEEK_END);
-    size = ftell(handle);
-    fseek(handle, 0, SEEK_SET);
+    size = M_FileLength(handle);
 
     // Read in the entire file
     // Allocate one byte extra - this is incase there is an argument
@@ -204,6 +203,7 @@ static void LoadResponseFile(int argv_index)
 //
 // Find a Response File
 //
+
 void M_FindResponseFile(void)
 {
     int             i;
@@ -217,6 +217,3 @@ void M_FindResponseFile(void)
     }
 }
 
-
-
-
diff --git a/src/m_config.c b/src/m_config.c
new file mode 100644
index 00000000..15ff2fde
--- /dev/null
+++ b/src/m_config.c
@@ -0,0 +1,1050 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+//
+// DESCRIPTION:
+//    Configuration file interface.
+//
+//-----------------------------------------------------------------------------
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "config.h"
+#include "deh_main.h"
+#include "doomdef.h"
+#include "doomfeatures.h"
+
+#include "z_zone.h"
+
+#include "m_menu.h"
+#include "m_argv.h"
+#include "net_client.h"
+
+#include "w_wad.h"
+
+#include "i_joystick.h"
+#include "i_swap.h"
+#include "i_system.h"
+#include "i_video.h"
+#include "v_video.h"
+
+#include "hu_stuff.h"
+
+// State.
+#include "doomstat.h"
+
+// Data.
+#include "dstrings.h"
+
+#include "m_misc.h"
+
+
+//
+// DEFAULTS
+//
+
+// Location where all configuration data is stored - 
+// default.cfg, savegames, etc.
+
+char *          configdir;
+
+
+int		usemouse = 1;
+int		usejoystick = 0;
+
+extern int	key_right;
+extern int	key_left;
+extern int	key_up;
+extern int	key_down;
+
+extern int	key_strafeleft;
+extern int	key_straferight;
+
+extern int	key_fire;
+extern int	key_use;
+extern int	key_strafe;
+extern int	key_speed;
+
+extern int	mousebfire;
+extern int	mousebstrafe;
+extern int	mousebforward;
+
+extern int      mousebstrafeleft;
+extern int      mousebstraferight;
+extern int      mousebbackward;
+extern int      mousebuse;
+
+extern int      dclick_use;
+
+extern int	joybfire;
+extern int	joybstrafe;
+extern int	joybuse;
+extern int	joybspeed;
+extern int      joybstrafeleft;
+extern int      joybstraferight;
+
+extern int	viewwidth;
+extern int	viewheight;
+
+extern int	mouseSensitivity;
+extern int	showMessages;
+
+// machine-independent sound params
+extern	int	numChannels;
+
+
+extern char*	chat_macros[];
+
+extern int      show_endoom;
+extern int      vanilla_savegame_limit;
+extern int      vanilla_demo_limit;
+
+extern int snd_musicdevice;
+extern int snd_sfxdevice;
+extern int snd_samplerate;
+
+// controls whether to use libsamplerate for sample rate conversions
+
+extern int use_libsamplerate;
+
+// 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_sbport = 0;
+static int snd_sbirq = 0;
+static int snd_sbdma = 0;
+static int snd_mport = 0;
+
+typedef enum 
+{
+    DEFAULT_INT,
+    DEFAULT_STRING,
+    DEFAULT_FLOAT,
+    DEFAULT_KEY,
+} default_type_t;
+
+typedef struct
+{
+    // Name of the variable
+    char *         name;
+
+    // Pointer to the location in memory of the variable
+    void *         location;
+
+    // Type of the variable
+    default_type_t type;
+
+    // If this is a key value, the original integer scancode we read from
+    // the config file before translating it to the internal key value.
+    // If zero, we didn't read this value from a config file.
+    int            untranslated;
+
+    // The value we translated the scancode into when we read the 
+    // config file on startup.  If the variable value is different from
+    // this, it has been changed and needs to be converted; otherwise,
+    // use the 'untranslated' value.
+    int            original_translated;
+} default_t;
+
+typedef struct
+{
+    default_t *defaults;
+    int        numdefaults;
+    char      *filename;
+} default_collection_t;
+
+#define CONFIG_VARIABLE_KEY(name, variable) \
+    { #name, &variable, DEFAULT_KEY, 0, 0 }
+#define CONFIG_VARIABLE_INT(name, variable) \
+    { #name, &variable, DEFAULT_INT, 0, 0 }
+#define CONFIG_VARIABLE_FLOAT(name, variable) \
+    { #name, &variable, DEFAULT_FLOAT, 0, 0 }
+#define CONFIG_VARIABLE_STRING(name, variable) \
+    { #name, &variable, DEFAULT_STRING, 0, 0 }
+
+//! @begin_config_file default.cfg
+
+static default_t	doom_defaults_list[] =
+{
+    //! 
+    // Mouse sensitivity.  This value is used to multiply input mouse
+    // movement to control the effect of moving the mouse.
+    //
+    // The "normal" maximum value available for this through the 
+    // in-game options menu is 9. A value of 31 or greater will cause
+    // the game to crash when entering the options menu.
+    //
+
+    CONFIG_VARIABLE_INT(mouse_sensitivity, mouseSensitivity),
+
+    //!
+    // Volume of sound effects, range 0-15.
+    //
+
+    CONFIG_VARIABLE_INT(sfx_volume,        sfxVolume),
+
+    //!
+    // Volume of in-game music, range 0-15.
+    //
+
+    CONFIG_VARIABLE_INT(music_volume,      musicVolume),
+
+    //!
+    // If non-zero, messages are displayed on the heads-up display
+    // in the game ("picked up a clip", etc).  If zero, these messages
+    // are not displayed.
+    //
+
+    CONFIG_VARIABLE_INT(show_messages,     showMessages),
+
+    //! 
+    // Keyboard key to turn right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_right,         key_right),
+
+    //!
+    // Keyboard key to turn left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_left,          key_left),
+
+    //!
+    // Keyboard key to move forward.
+    //
+
+    CONFIG_VARIABLE_KEY(key_up,            key_up),
+
+    //!
+    // Keyboard key to move backward.
+    //
+
+    CONFIG_VARIABLE_KEY(key_down,          key_down),
+
+    //!
+    // Keyboard key to strafe left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_strafeleft,    key_strafeleft),
+
+    //!
+    // Keyboard key to strafe right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_straferight,   key_straferight),
+
+    //!
+    // Keyboard key to fire the currently selected weapon.
+    //
+
+    CONFIG_VARIABLE_KEY(key_fire,          key_fire),
+
+    //!
+    // Keyboard key to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_KEY(key_use,           key_use),
+
+    //!
+    // Keyboard key to turn on strafing.  When held down, pressing the
+    // key to turn left or right causes the player to strafe left or
+    // right instead.
+    //
+
+    CONFIG_VARIABLE_KEY(key_strafe,        key_strafe),
+
+    //!
+    // Keyboard key to make the player run.
+    //
+
+    CONFIG_VARIABLE_KEY(key_speed,         key_speed),
+
+    //!
+    // If non-zero, mouse input is enabled.  If zero, mouse input is
+    // disabled.
+    //
+
+    CONFIG_VARIABLE_INT(use_mouse,         usemouse),
+
+    //!
+    // Mouse button to fire the currently selected weapon.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_fire,       mousebfire),
+
+    //!
+    // Mouse button to turn on strafing.  When held down, the player
+    // will strafe left and right instead of turning left and right.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_strafe,     mousebstrafe),
+
+    //!
+    // Mouse button to move forward.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_forward,    mousebforward),
+
+    //!
+    // If non-zero, joystick input is enabled.
+    //
+
+    CONFIG_VARIABLE_INT(use_joystick,      usejoystick),
+
+    //!
+    // Joystick button to fire the current weapon.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_fire,         joybfire),
+
+    //!
+    // Joystick button to fire the current weapon.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_strafe,       joybstrafe),
+
+    //!
+    // Joystick button to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_use,          joybuse),
+
+    //!
+    // Joystick button to make the player run.
+    //
+    // If this has a value of 20 or greater, the player will always run.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_speed,        joybspeed),
+
+    //!
+    // Screen size, range 3-11.
+    //
+    // A value of 11 gives a full-screen view with the status bar not 
+    // displayed.  A value of 10 gives a full-screen view with the
+    // status bar displayed.
+    //
+
+    CONFIG_VARIABLE_INT(screenblocks,      screenblocks),
+
+    //!
+    // Screen detail.  Zero gives normal "high detail" mode, while
+    // a non-zero value gives "low detail" mode.
+    //
+
+    CONFIG_VARIABLE_INT(detaillevel,       detailLevel),
+
+    //!
+    // Number of sounds that will be played simultaneously.
+    //
+
+    CONFIG_VARIABLE_INT(snd_channels,      numChannels),
+
+    //!
+    // Music output device.  A non-zero value gives MIDI sound output,
+    // while a value of zero disables music.
+    //
+
+    CONFIG_VARIABLE_INT(snd_musicdevice,   snd_musicdevice),
+
+    //!
+    // Sound effects device.  A value of zero disables in-game sound 
+    // effects, a value of 1 enables PC speaker sound effects, while 
+    // a value in the range 2-9 enables the "normal" digital sound 
+    // effects.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sfxdevice,     snd_sfxdevice),
+
+    //!
+    // SoundBlaster I/O port. Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbport,        snd_sbport),
+
+    //!
+    // SoundBlaster IRQ.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbirq,         snd_sbirq),
+
+    //!
+    // SoundBlaster DMA channel.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_sbdma,         snd_sbdma),
+
+    //!
+    // Output port to use for OPL MIDI playback.  Unused.
+    //
+
+    CONFIG_VARIABLE_INT(snd_mport,         snd_mport),
+
+    //!
+    // Gamma correction level.  A value of zero disables gamma 
+    // correction, while a value in the range 1-4 gives increasing
+    // levels of gamma correction.
+    //
+
+    CONFIG_VARIABLE_INT(usegamma,          usegamma),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+0 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro0,     chat_macros[0]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+1 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro1,     chat_macros[1]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+2 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro2,     chat_macros[2]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+3 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro3,     chat_macros[3]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+4 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro4,     chat_macros[4]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+5 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro5,     chat_macros[5]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+6 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro6,     chat_macros[6]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+7 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro7,     chat_macros[7]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+8 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro8,     chat_macros[8]),
+
+    //!
+    // Multiplayer chat macro: message to send when alt+9 is pressed.
+    //
+
+    CONFIG_VARIABLE_STRING(chatmacro9,     chat_macros[9]),
+};
+
+static default_collection_t doom_defaults = 
+{
+    doom_defaults_list,
+    arrlen(doom_defaults_list),
+    NULL,
+};
+
+//! @begin_config_file chocolate-doom.cfg
+
+static default_t extra_defaults_list[] = 
+{
+    //!
+    // If non-zero, video settings will be autoadjusted to a valid 
+    // configuration when the screen_width and screen_height variables
+    // do not match any valid configuration.
+    //
+
+    CONFIG_VARIABLE_INT(autoadjust_video_settings, autoadjust_video_settings),
+
+    //!
+    // If non-zero, the game will run in full screen mode.  If zero,
+    // the game will run in a window.
+    //
+
+    CONFIG_VARIABLE_INT(fullscreen,                fullscreen),
+
+    //!
+    // If non-zero, the screen will be stretched vertically to display
+    // correctly on a square pixel video mode.
+    //
+
+    CONFIG_VARIABLE_INT(aspect_ratio_correct,      aspect_ratio_correct),
+
+    //!
+    // Number of milliseconds to wait on startup after the video mode
+    // has been set, before the game will start.  This allows the 
+    // screen to settle on some monitors that do not display an image 
+    // for a brief interval after changing video modes.
+    //
+
+    CONFIG_VARIABLE_INT(startup_delay,             startup_delay),
+
+    //!
+    // Screen width in pixels.  If running in full screen mode, this is
+    // the X dimension of the video mode to use.  If running in
+    // windowed mode, this is the width of the window in which the game
+    // will run.
+    //
+
+    CONFIG_VARIABLE_INT(screen_width,              screen_width),
+
+    //!
+    // Screen height in pixels.  If running in full screen mode, this is
+    // the Y dimension of the video mode to use.  If running in
+    // windowed mode, this is the height of the window in which the game
+    // will run.
+    //
+
+    CONFIG_VARIABLE_INT(screen_height,             screen_height),
+
+    //!
+    // If this is non-zero, the mouse will be "grabbed" when running
+    // in windowed mode so that it can be used as an input device.
+    // When running full screen, this has no effect.
+    //
+
+    CONFIG_VARIABLE_INT(grabmouse,                 grabmouse),
+
+    //!
+    // If non-zero, all vertical mouse movement is ignored.  This 
+    // emulates the behavior of the "novert" tool available under DOS
+    // that performs the same function.
+    //
+
+    CONFIG_VARIABLE_INT(novert,                    novert),
+
+    //!
+    // Mouse acceleration factor.  When the speed of mouse movement
+    // exceeds the threshold value (mouse_threshold), the speed is
+    // multiplied by this value.
+    //
+
+    CONFIG_VARIABLE_FLOAT(mouse_acceleration,      mouse_acceleration),
+
+    //!
+    // Mouse acceleration threshold.  When the speed of mouse movement
+    // exceeds this threshold value, the speed is multiplied by an 
+    // acceleration factor (mouse_acceleration).
+    //
+
+    CONFIG_VARIABLE_INT(mouse_threshold,           mouse_threshold),
+
+    //!
+    // Sound output sample rate, in Hz.  Typical values to use are 
+    // 11025, 22050, 44100 and 48000.
+    //
+
+    CONFIG_VARIABLE_INT(snd_samplerate,            snd_samplerate),
+
+    //!
+    // If non-zero, the ENDOOM screen is displayed when exiting the
+    // game.  If zero, the ENDOOM screen is not displayed.
+    //
+
+    CONFIG_VARIABLE_INT(show_endoom,               show_endoom),
+
+    //!
+    // If non-zero, the Vanilla savegame limit is enforced; if the 
+    // savegame exceeds 180224 bytes in size, the game will exit with
+    // an error.  If this has a value of zero, there is no limit to
+    // the size of savegames.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_savegame_limit,    vanilla_savegame_limit),
+
+    //!
+    // If non-zero, the Vanilla demo size limit is enforced; the game 
+    // exits with an error when a demo exceeds the demo size limit
+    // (128KiB by default).  If this has a value of zero, there is no
+    // limit to the size of demos.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_demo_limit,        vanilla_demo_limit),
+
+    //!
+    // If non-zero, the game behaves like Vanilla Doom, always assuming
+    // an American keyboard mapping.  If this has a value of zero, the 
+    // native keyboard mapping of the keyboard is used.
+    //
+
+    CONFIG_VARIABLE_INT(vanilla_keyboard_mapping,  vanilla_keyboard_mapping),
+
+    //!
+    // Name of the SDL video driver to use.  If this is an empty string,
+    // the default video driver is used.
+    //
+
+    CONFIG_VARIABLE_STRING(video_driver,           video_driver),
+
+#ifdef FEATURE_MULTIPLAYER
+
+    //!
+    // Name to use in network games for identification.  This is only 
+    // used on the "waiting" screen while waiting for the game to start.
+    //
+
+    CONFIG_VARIABLE_STRING(player_name,            net_player_name),
+
+#endif
+
+    //!
+    // Joystick number to use; '0' is the first joystick.  A negative
+    // value ('-1') indicates that no joystick is configured.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_index,            joystick_index),
+
+    //!
+    // Joystick axis to use to for horizontal (X) movement.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_x_axis,           joystick_x_axis),
+
+    //!
+    // If non-zero, movement on the horizontal joystick axis is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_x_invert,         joystick_x_invert),
+
+    //!
+    // Joystick axis to use to for vertical (Y) movement.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_y_axis,           joystick_y_axis),
+
+    //!
+    // If non-zero, movement on the vertical joystick axis is inverted.
+    //
+
+    CONFIG_VARIABLE_INT(joystick_y_invert,         joystick_y_invert),
+
+    //!
+    // Joystick button to strafe left.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_strafeleft,           joybstrafeleft),
+
+    //!
+    // Joystick button to strafe right.
+    //
+
+    CONFIG_VARIABLE_INT(joyb_straferight,          joybstraferight),
+
+    //!
+    // Mouse button to strafe left.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_strafeleft,         mousebstrafeleft),
+
+    //!
+    // Mouse button to strafe right.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_straferight,        mousebstraferight),
+
+    //!
+    // Mouse button to "use" an object, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_use,                mousebuse),
+
+    //!
+    // Mouse button to move backwards.
+    //
+
+    CONFIG_VARIABLE_INT(mouseb_backward,           mousebbackward),
+
+    //!
+    // If non-zero, double-clicking a mouse button acts like pressing
+    // the "use" key to use an object in-game, eg. a door or switch.
+    //
+
+    CONFIG_VARIABLE_INT(dclick_use,                dclick_use),
+
+    //!
+    // If non-zero, libsamplerate is used to resample sound effects to
+    // the output sample rate.  This has no effect if libsamplerate
+    // support has not been compiled into the game.
+    //
+
+    CONFIG_VARIABLE_INT(use_libsamplerate,         use_libsamplerate),
+};
+
+static default_collection_t extra_defaults =
+{
+    extra_defaults_list,
+    arrlen(extra_defaults_list),
+    NULL,
+};
+
+static const int scantokey[128] =
+{
+    0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6',
+    '7',    '8',    '9',    '0',    '-',    '=',    KEY_BACKSPACE, 9,
+    'q',    'w',    'e',    'r',    't',    'y',    'u',    'i',
+    'o',    'p',    '[',    ']',    13,		KEY_RCTRL, 'a',    's',
+    'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';',
+    '\'',   '`',    KEY_RSHIFT,'\\',   'z',    'x',    'c',    'v',
+    'b',    'n',    'm',    ',',    '.',    '/',    KEY_RSHIFT,KEYP_MULTIPLY,
+    KEY_RALT,  ' ',  KEY_CAPSLOCK,KEY_F1,  KEY_F2,   KEY_F3,   KEY_F4,   KEY_F5,
+    KEY_F6,   KEY_F7,   KEY_F8,   KEY_F9,   KEY_F10,  KEY_PAUSE,KEY_SCRLCK,KEY_HOME,
+    KEY_UPARROW,KEY_PGUP,KEY_MINUS,KEY_LEFTARROW,KEYP_5,KEY_RIGHTARROW,KEYP_PLUS,KEY_END,
+    KEY_DOWNARROW,KEY_PGDN,KEY_INS,KEY_DEL,0,   0,      0,      KEY_F11,
+    KEY_F12,  0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0,
+    0,      0,      0,      0,      0,      0,      0,      0
+};
+
+
+static void SaveDefaultCollection(default_collection_t *collection)
+{
+    default_t *defaults;
+    int i, v;
+    FILE *f;
+	
+    f = fopen (collection->filename, "w");
+    if (!f)
+	return; // can't write the file, but don't complain
+
+    defaults = collection->defaults;
+		
+    for (i=0 ; i<collection->numdefaults ; i++)
+    {
+        int chars_written;
+
+        // Print the name and line up all values at 30 characters
+
+        chars_written = fprintf(f, "%s ", defaults[i].name);
+
+        for (; chars_written < 30; ++chars_written)
+            fprintf(f, " ");
+
+        // Print the value
+
+        switch (defaults[i].type) 
+        {
+            case DEFAULT_KEY:
+
+                // use the untranslated version if we can, to reduce
+                // the possibility of screwing up the user's config
+                // file
+                
+                v = * (int *) defaults[i].location;
+
+                if (defaults[i].untranslated
+                 && v == defaults[i].original_translated)
+                {
+                    // Has not been changed since the last time we
+                    // read the config file.
+
+                    v = defaults[i].untranslated;
+                }
+                else
+                {
+                    // search for a reverse mapping back to a scancode
+                    // in the scantokey table
+
+                    int s;
+
+                    for (s=0; s<128; ++s)
+                    {
+                        if (scantokey[s] == v)
+                        {
+                            v = s;
+                            break;
+                        }
+                    }
+                }
+
+	        fprintf(f, "%i", v);
+                break;
+
+            case DEFAULT_INT:
+	        fprintf(f, "%i", * (int *) defaults[i].location);
+                break;
+
+            case DEFAULT_FLOAT:
+                fprintf(f, "%f", * (float *) defaults[i].location);
+                break;
+
+            case DEFAULT_STRING:
+	        fprintf(f,"\"%s\"", * (char **) (defaults[i].location));
+                break;
+        }
+
+        fprintf(f, "\n");
+    }
+
+    fclose (f);
+}
+
+// Parses integer values in the configuration file
+
+static int ParseIntParameter(char *strparm)
+{
+    int parm;
+
+    if (strparm[0] == '0' && strparm[1] == 'x')
+        sscanf(strparm+2, "%x", &parm);
+    else
+        sscanf(strparm, "%i", &parm);
+
+    return parm;
+}
+
+static void LoadDefaultCollection(default_collection_t *collection)
+{
+    default_t  *defaults = collection->defaults;
+    int		i;
+    FILE*	f;
+    char	defname[80];
+    char	strparm[100];
+
+    // read the file in, overriding any set defaults
+    f = fopen(collection->filename, "r");
+
+    if (!f)
+    {
+        // File not opened, but don't complain
+
+        return;
+    }
+    
+    while (!feof(f))
+    {
+        if (fscanf (f, "%79s %[^\n]\n", defname, strparm) != 2)
+        {
+            // This line doesn't match
+          
+            continue;
+        }
+
+        // Strip off trailing non-printable characters (\r characters
+        // from DOS text files)
+
+        while (strlen(strparm) > 0 && !isprint(strparm[strlen(strparm)-1]))
+        {
+            strparm[strlen(strparm)-1] = '\0';
+        }
+        
+        // Find the setting in the list
+       
+        for (i=0; i<collection->numdefaults; ++i)
+        {
+            default_t *def = &collection->defaults[i];
+            char *s;
+            int intparm;
+
+            if (strcmp(defname, def->name) != 0)
+            {
+                // not this one
+                continue;
+            }
+
+            // parameter found
+
+            switch (def->type)
+            {
+                case DEFAULT_STRING:
+                    s = strdup(strparm + 1);
+                    s[strlen(s) - 1] = '\0';
+                    * (char **) def->location = s;
+                    break;
+
+                case DEFAULT_INT:
+                    * (int *) def->location = ParseIntParameter(strparm);
+                    break;
+
+                case DEFAULT_KEY:
+
+                    // translate scancodes read from config
+                    // file (save the old value in untranslated)
+
+                    intparm = ParseIntParameter(strparm);
+                    defaults[i].untranslated = intparm;
+                    intparm = scantokey[intparm];
+
+                    defaults[i].original_translated = intparm;
+                    * (int *) def->location = intparm;
+                    break;
+
+                case DEFAULT_FLOAT:
+                    * (float *) def->location = (float) atof(strparm);
+                    break;
+            }
+
+            // finish
+
+            break; 
+        }
+    }
+            
+    fclose (f);
+}
+
+//
+// M_SaveDefaults
+//
+
+void M_SaveDefaults (void)
+{
+    SaveDefaultCollection(&doom_defaults);
+    SaveDefaultCollection(&extra_defaults);
+}
+
+
+//
+// M_LoadDefaults
+//
+
+void M_LoadDefaults (void)
+{
+    int i;
+ 
+    // check for a custom default file
+
+    //!
+    // @arg <file>
+    // @vanilla
+    //
+    // Load configuration from the specified file, instead of
+    // default.cfg.
+    //
+
+    i = M_CheckParm ("-config");
+
+    if (i && i<myargc-1)
+    {
+	doom_defaults.filename = myargv[i+1];
+	printf ("	default file: %s\n",doom_defaults.filename);
+    }
+    else
+    {
+        doom_defaults.filename = malloc(strlen(configdir) + 20);
+        sprintf(doom_defaults.filename, "%sdefault.cfg", configdir);
+    }
+
+    printf("saving config in %s\n", doom_defaults.filename);
+
+    //!
+    // @arg <file>
+    //
+    // Load extra configuration from the specified file, instead 
+    // of chocolate-doom.cfg.
+    //
+
+    i = M_CheckParm("-extraconfig");
+
+    if (i && i<myargc-1)
+    {
+        extra_defaults.filename = myargv[i+1];
+        printf("        extra configuration file: %s\n", 
+               extra_defaults.filename);
+    }
+    else
+    {
+        extra_defaults.filename 
+            = malloc(strlen(configdir) + strlen(PACKAGE_TARNAME) + 10);
+        sprintf(extra_defaults.filename, "%s%s.cfg", 
+                configdir, PACKAGE_TARNAME);
+    }
+
+    LoadDefaultCollection(&doom_defaults);
+    LoadDefaultCollection(&extra_defaults);
+}
+
+// 
+// SetConfigDir:
+//
+// Sets the location of the configuration directory, where configuration
+// files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
+//
+
+void M_SetConfigDir(void)
+{
+#ifndef _WIN32
+    // Ignore the HOME environment variable on Windows - just behave
+    // like Vanilla Doom.
+
+    char *homedir;
+
+    homedir = getenv("HOME");
+
+    if (homedir != NULL)
+    {
+        // put all configuration in a config directory off the
+        // homedir
+
+        configdir = malloc(strlen(homedir) + strlen(PACKAGE_TARNAME) + 5);
+
+        sprintf(configdir, "%s%c.%s%c", homedir, DIR_SEPARATOR,
+			                PACKAGE_TARNAME, DIR_SEPARATOR);
+
+        // make the directory if it doesnt already exist
+
+        M_MakeDirectory(configdir);
+    }
+    else
+#endif /* #ifndef _WIN32 */
+    {
+#ifdef _WIN32
+        //!
+        // @platform windows
+        // @vanilla
+        //
+        // Save configuration data and savegames in c:\doomdata,
+        // allowing play from CD.
+        //
+
+        if (M_CheckParm("-cdrom") > 0)
+        {
+            printf(D_CDROM);
+            configdir = strdup("c:\\doomdata\\");
+
+            M_MakeDirectory(configdir);
+        }
+        else
+#endif
+        {
+            configdir = strdup("");
+        }
+    }
+}
+
diff --git a/src/m_config.h b/src/m_config.h
new file mode 100644
index 00000000..747569cd
--- /dev/null
+++ b/src/m_config.h
@@ -0,0 +1,37 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 1993-1996 Id Software, Inc.
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+// DESCRIPTION:
+//      Configuration file interface.
+//    
+//-----------------------------------------------------------------------------
+
+
+#ifndef __M_CONFIG__
+#define __M_CONFIG__
+
+void M_LoadDefaults(void);
+void M_SaveDefaults(void);
+void M_SetConfigDir(void);
+
+extern char *configdir;
+
+#endif
diff --git a/src/m_misc.c b/src/m_misc.c
index 40bf2bce..acab0a5b 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -19,11 +19,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 //
-//
 // DESCRIPTION:
-//	Main loop menu stuff.
-//	Default Config File.
-//	PCX Screenshots.
+//      Miscellaneous.
 //
 //-----------------------------------------------------------------------------
 
@@ -45,74 +42,18 @@
 #include <sys/types.h>
 #endif
 
-#include "config.h"
-#include "deh_main.h"
 #include "doomdef.h"
-#include "doomfeatures.h"
-
-#include "z_zone.h"
-
-#include "m_menu.h"
-#include "m_argv.h"
-#include "net_client.h"
+#include "doomstat.h"
 
-#include "w_wad.h"
+#include "deh_main.h"
 
-#include "i_joystick.h"
 #include "i_swap.h"
 #include "i_system.h"
 #include "i_video.h"
-#include "v_video.h"
-
-#include "hu_stuff.h"
-
-// State.
-#include "doomstat.h"
-
-// Data.
-#include "dstrings.h"
-
 #include "m_misc.h"
-
-//
-// M_DrawText
-// Returns the final X coordinate
-// HU_Init must have been called to init the font
-//
-extern patch_t*		hu_font[HU_FONTSIZE];
-
-int
-M_DrawText
-( int		x,
-  int		y,
-  boolean	direct,
-  char*		string )
-{
-    int 	c;
-    int		w;
-
-    while (*string)
-    {
-	c = toupper(*string) - HU_FONTSTART;
-	string++;
-	if (c < 0 || c> HU_FONTSIZE)
-	{
-	    x += 4;
-	    continue;
-	}
-		
-	w = SHORT (hu_font[c]->width);
-	if (x+w > SCREENWIDTH)
-	    break;
-	if (direct)
-	    V_DrawPatchDirect(x, y, 0, hu_font[c]);
-	else
-	    V_DrawPatch(x, y, 0, hu_font[c]);
-	x+=w;
-    }
-
-    return x;
-}
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
 
 //
 // Create a directory
@@ -149,13 +90,33 @@ boolean M_FileExists(char *filename)
     }
 }
 
+//
+// Determine the length of an open file.
+//
+
+long M_FileLength(FILE *handle)
+{ 
+    long savedpos;
+    long length;
 
+    // save the current position in the file
+    savedpos = ftell(handle);
+    
+    // jump to the end and find the length
+    fseek(handle, 0, SEEK_END);
+    length = ftell(handle);
 
+    // go back to the old location
+    fseek(handle, savedpos, SEEK_SET);
+
+    return length;
+}
 
 //
 // M_WriteFile
 //
-boolean M_WriteFile(char const *name, void *source, int	length)
+
+boolean M_WriteFile(char *name, void *source, int length)
 {
     FILE *handle;
     int	count;
@@ -178,7 +139,8 @@ boolean M_WriteFile(char const *name, void *source, int	length)
 //
 // M_ReadFile
 //
-int M_ReadFile(char const *name, byte **buffer)
+
+int M_ReadFile(char *name, byte **buffer)
 {
     FILE *handle;
     int	count, length;
@@ -191,9 +153,7 @@ int M_ReadFile(char const *name, byte **buffer)
     // find the size of the file by seeking to the end and
     // reading the current position
 
-    fseek(handle, 0, SEEK_END);
-    length = ftell(handle);
-    fseek(handle, 0, SEEK_SET);
+    length = M_FileLength(handle);
     
     buf = Z_Malloc (length, PU_STATIC, NULL);
     count = fread(buf, 1, length, handle);
@@ -238,1120 +198,3 @@ char *M_TempFile(char *s)
     return result;
 }
 
-//
-// DEFAULTS
-//
-
-// Location where all configuration data is stored - 
-// default.cfg, savegames, etc.
-
-char *          configdir;
-
-
-int		usemouse = 1;
-int		usejoystick = 0;
-
-extern int	key_right;
-extern int	key_left;
-extern int	key_up;
-extern int	key_down;
-
-extern int	key_strafeleft;
-extern int	key_straferight;
-
-extern int	key_fire;
-extern int	key_use;
-extern int	key_strafe;
-extern int	key_speed;
-
-extern int	mousebfire;
-extern int	mousebstrafe;
-extern int	mousebforward;
-
-extern int      mousebstrafeleft;
-extern int      mousebstraferight;
-extern int      mousebbackward;
-extern int      mousebuse;
-
-extern int      dclick_use;
-
-extern int	joybfire;
-extern int	joybstrafe;
-extern int	joybuse;
-extern int	joybspeed;
-extern int      joybstrafeleft;
-extern int      joybstraferight;
-
-extern int	viewwidth;
-extern int	viewheight;
-
-extern int	mouseSensitivity;
-extern int	showMessages;
-
-// machine-independent sound params
-extern	int	numChannels;
-
-
-extern char*	chat_macros[];
-
-extern int      show_endoom;
-extern int      vanilla_savegame_limit;
-extern int      vanilla_demo_limit;
-
-extern int snd_musicdevice;
-extern int snd_sfxdevice;
-extern int snd_samplerate;
-
-// controls whether to use libsamplerate for sample rate conversions
-
-extern int use_libsamplerate;
-
-// 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_sbport = 0;
-static int snd_sbirq = 0;
-static int snd_sbdma = 0;
-static int snd_mport = 0;
-
-typedef enum 
-{
-    DEFAULT_INT,
-    DEFAULT_STRING,
-    DEFAULT_FLOAT,
-    DEFAULT_KEY,
-} default_type_t;
-
-typedef struct
-{
-    // Name of the variable
-    char *         name;
-
-    // Pointer to the location in memory of the variable
-    void *         location;
-
-    // Type of the variable
-    default_type_t type;
-
-    // If this is a key value, the original integer scancode we read from
-    // the config file before translating it to the internal key value.
-    // If zero, we didn't read this value from a config file.
-    int            untranslated;
-
-    // The value we translated the scancode into when we read the 
-    // config file on startup.  If the variable value is different from
-    // this, it has been changed and needs to be converted; otherwise,
-    // use the 'untranslated' value.
-    int            original_translated;
-} default_t;
-
-typedef struct
-{
-    default_t *defaults;
-    int        numdefaults;
-    char      *filename;
-} default_collection_t;
-
-#define CONFIG_VARIABLE_KEY(name, variable) \
-    { #name, &variable, DEFAULT_KEY, 0, 0 }
-#define CONFIG_VARIABLE_INT(name, variable) \
-    { #name, &variable, DEFAULT_INT, 0, 0 }
-#define CONFIG_VARIABLE_FLOAT(name, variable) \
-    { #name, &variable, DEFAULT_FLOAT, 0, 0 }
-#define CONFIG_VARIABLE_STRING(name, variable) \
-    { #name, &variable, DEFAULT_STRING, 0, 0 }
-
-//! @begin_config_file default.cfg
-
-static default_t	doom_defaults_list[] =
-{
-    //! 
-    // Mouse sensitivity.  This value is used to multiply input mouse
-    // movement to control the effect of moving the mouse.
-    //
-    // The "normal" maximum value available for this through the 
-    // in-game options menu is 9. A value of 31 or greater will cause
-    // the game to crash when entering the options menu.
-    //
-
-    CONFIG_VARIABLE_INT(mouse_sensitivity, mouseSensitivity),
-
-    //!
-    // Volume of sound effects, range 0-15.
-    //
-
-    CONFIG_VARIABLE_INT(sfx_volume,        sfxVolume),
-
-    //!
-    // Volume of in-game music, range 0-15.
-    //
-
-    CONFIG_VARIABLE_INT(music_volume,      musicVolume),
-
-    //!
-    // If non-zero, messages are displayed on the heads-up display
-    // in the game ("picked up a clip", etc).  If zero, these messages
-    // are not displayed.
-    //
-
-    CONFIG_VARIABLE_INT(show_messages,     showMessages),
-
-    //! 
-    // Keyboard key to turn right.
-    //
-
-    CONFIG_VARIABLE_KEY(key_right,         key_right),
-
-    //!
-    // Keyboard key to turn left.
-    //
-
-    CONFIG_VARIABLE_KEY(key_left,          key_left),
-
-    //!
-    // Keyboard key to move forward.
-    //
-
-    CONFIG_VARIABLE_KEY(key_up,            key_up),
-
-    //!
-    // Keyboard key to move backward.
-    //
-
-    CONFIG_VARIABLE_KEY(key_down,          key_down),
-
-    //!
-    // Keyboard key to strafe left.
-    //
-
-    CONFIG_VARIABLE_KEY(key_strafeleft,    key_strafeleft),
-
-    //!
-    // Keyboard key to strafe right.
-    //
-
-    CONFIG_VARIABLE_KEY(key_straferight,   key_straferight),
-
-    //!
-    // Keyboard key to fire the currently selected weapon.
-    //
-
-    CONFIG_VARIABLE_KEY(key_fire,          key_fire),
-
-    //!
-    // Keyboard key to "use" an object, eg. a door or switch.
-    //
-
-    CONFIG_VARIABLE_KEY(key_use,           key_use),
-
-    //!
-    // Keyboard key to turn on strafing.  When held down, pressing the
-    // key to turn left or right causes the player to strafe left or
-    // right instead.
-    //
-
-    CONFIG_VARIABLE_KEY(key_strafe,        key_strafe),
-
-    //!
-    // Keyboard key to make the player run.
-    //
-
-    CONFIG_VARIABLE_KEY(key_speed,         key_speed),
-
-    //!
-    // If non-zero, mouse input is enabled.  If zero, mouse input is
-    // disabled.
-    //
-
-    CONFIG_VARIABLE_INT(use_mouse,         usemouse),
-
-    //!
-    // Mouse button to fire the currently selected weapon.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_fire,       mousebfire),
-
-    //!
-    // Mouse button to turn on strafing.  When held down, the player
-    // will strafe left and right instead of turning left and right.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_strafe,     mousebstrafe),
-
-    //!
-    // Mouse button to move forward.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_forward,    mousebforward),
-
-    //!
-    // If non-zero, joystick input is enabled.
-    //
-
-    CONFIG_VARIABLE_INT(use_joystick,      usejoystick),
-
-    //!
-    // Joystick button to fire the current weapon.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_fire,         joybfire),
-
-    //!
-    // Joystick button to fire the current weapon.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_strafe,       joybstrafe),
-
-    //!
-    // Joystick button to "use" an object, eg. a door or switch.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_use,          joybuse),
-
-    //!
-    // Joystick button to make the player run.
-    //
-    // If this has a value of 20 or greater, the player will always run.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_speed,        joybspeed),
-
-    //!
-    // Screen size, range 3-11.
-    //
-    // A value of 11 gives a full-screen view with the status bar not 
-    // displayed.  A value of 10 gives a full-screen view with the
-    // status bar displayed.
-    //
-
-    CONFIG_VARIABLE_INT(screenblocks,      screenblocks),
-
-    //!
-    // Screen detail.  Zero gives normal "high detail" mode, while
-    // a non-zero value gives "low detail" mode.
-    //
-
-    CONFIG_VARIABLE_INT(detaillevel,       detailLevel),
-
-    //!
-    // Number of sounds that will be played simultaneously.
-    //
-
-    CONFIG_VARIABLE_INT(snd_channels,      numChannels),
-
-    //!
-    // Music output device.  A non-zero value gives MIDI sound output,
-    // while a value of zero disables music.
-    //
-
-    CONFIG_VARIABLE_INT(snd_musicdevice,   snd_musicdevice),
-
-    //!
-    // Sound effects device.  A value of zero disables in-game sound 
-    // effects, a value of 1 enables PC speaker sound effects, while 
-    // a value in the range 2-9 enables the "normal" digital sound 
-    // effects.
-    //
-
-    CONFIG_VARIABLE_INT(snd_sfxdevice,     snd_sfxdevice),
-
-    //!
-    // SoundBlaster I/O port. Unused.
-    //
-
-    CONFIG_VARIABLE_INT(snd_sbport,        snd_sbport),
-
-    //!
-    // SoundBlaster IRQ.  Unused.
-    //
-
-    CONFIG_VARIABLE_INT(snd_sbirq,         snd_sbirq),
-
-    //!
-    // SoundBlaster DMA channel.  Unused.
-    //
-
-    CONFIG_VARIABLE_INT(snd_sbdma,         snd_sbdma),
-
-    //!
-    // Output port to use for OPL MIDI playback.  Unused.
-    //
-
-    CONFIG_VARIABLE_INT(snd_mport,         snd_mport),
-
-    //!
-    // Gamma correction level.  A value of zero disables gamma 
-    // correction, while a value in the range 1-4 gives increasing
-    // levels of gamma correction.
-    //
-
-    CONFIG_VARIABLE_INT(usegamma,          usegamma),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+0 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro0,     chat_macros[0]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+1 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro1,     chat_macros[1]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+2 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro2,     chat_macros[2]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+3 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro3,     chat_macros[3]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+4 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro4,     chat_macros[4]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+5 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro5,     chat_macros[5]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+6 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro6,     chat_macros[6]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+7 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro7,     chat_macros[7]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+8 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro8,     chat_macros[8]),
-
-    //!
-    // Multiplayer chat macro: message to send when alt+9 is pressed.
-    //
-
-    CONFIG_VARIABLE_STRING(chatmacro9,     chat_macros[9]),
-};
-
-static default_collection_t doom_defaults = 
-{
-    doom_defaults_list,
-    arrlen(doom_defaults_list),
-    NULL,
-};
-
-//! @begin_config_file chocolate-doom.cfg
-
-static default_t extra_defaults_list[] = 
-{
-    //!
-    // If non-zero, video settings will be autoadjusted to a valid 
-    // configuration when the screen_width and screen_height variables
-    // do not match any valid configuration.
-    //
-
-    CONFIG_VARIABLE_INT(autoadjust_video_settings, autoadjust_video_settings),
-
-    //!
-    // If non-zero, the game will run in full screen mode.  If zero,
-    // the game will run in a window.
-    //
-
-    CONFIG_VARIABLE_INT(fullscreen,                fullscreen),
-
-    //!
-    // If non-zero, the screen will be stretched vertically to display
-    // correctly on a square pixel video mode.
-    //
-
-    CONFIG_VARIABLE_INT(aspect_ratio_correct,      aspect_ratio_correct),
-
-    //!
-    // Number of milliseconds to wait on startup after the video mode
-    // has been set, before the game will start.  This allows the 
-    // screen to settle on some monitors that do not display an image 
-    // for a brief interval after changing video modes.
-    //
-
-    CONFIG_VARIABLE_INT(startup_delay,             startup_delay),
-
-    //!
-    // Screen width in pixels.  If running in full screen mode, this is
-    // the X dimension of the video mode to use.  If running in
-    // windowed mode, this is the width of the window in which the game
-    // will run.
-    //
-
-    CONFIG_VARIABLE_INT(screen_width,              screen_width),
-
-    //!
-    // Screen height in pixels.  If running in full screen mode, this is
-    // the Y dimension of the video mode to use.  If running in
-    // windowed mode, this is the height of the window in which the game
-    // will run.
-    //
-
-    CONFIG_VARIABLE_INT(screen_height,             screen_height),
-
-    //!
-    // If this is non-zero, the mouse will be "grabbed" when running
-    // in windowed mode so that it can be used as an input device.
-    // When running full screen, this has no effect.
-    //
-
-    CONFIG_VARIABLE_INT(grabmouse,                 grabmouse),
-
-    //!
-    // If non-zero, all vertical mouse movement is ignored.  This 
-    // emulates the behavior of the "novert" tool available under DOS
-    // that performs the same function.
-    //
-
-    CONFIG_VARIABLE_INT(novert,                    novert),
-
-    //!
-    // Mouse acceleration factor.  When the speed of mouse movement
-    // exceeds the threshold value (mouse_threshold), the speed is
-    // multiplied by this value.
-    //
-
-    CONFIG_VARIABLE_FLOAT(mouse_acceleration,      mouse_acceleration),
-
-    //!
-    // Mouse acceleration threshold.  When the speed of mouse movement
-    // exceeds this threshold value, the speed is multiplied by an 
-    // acceleration factor (mouse_acceleration).
-    //
-
-    CONFIG_VARIABLE_INT(mouse_threshold,           mouse_threshold),
-
-    //!
-    // Sound output sample rate, in Hz.  Typical values to use are 
-    // 11025, 22050, 44100 and 48000.
-    //
-
-    CONFIG_VARIABLE_INT(snd_samplerate,            snd_samplerate),
-
-    //!
-    // If non-zero, the ENDOOM screen is displayed when exiting the
-    // game.  If zero, the ENDOOM screen is not displayed.
-    //
-
-    CONFIG_VARIABLE_INT(show_endoom,               show_endoom),
-
-    //!
-    // If non-zero, the Vanilla savegame limit is enforced; if the 
-    // savegame exceeds 180224 bytes in size, the game will exit with
-    // an error.  If this has a value of zero, there is no limit to
-    // the size of savegames.
-    //
-
-    CONFIG_VARIABLE_INT(vanilla_savegame_limit,    vanilla_savegame_limit),
-
-    //!
-    // If non-zero, the Vanilla demo size limit is enforced; the game 
-    // exits with an error when a demo exceeds the demo size limit
-    // (128KiB by default).  If this has a value of zero, there is no
-    // limit to the size of demos.
-    //
-
-    CONFIG_VARIABLE_INT(vanilla_demo_limit,        vanilla_demo_limit),
-
-    //!
-    // If non-zero, the game behaves like Vanilla Doom, always assuming
-    // an American keyboard mapping.  If this has a value of zero, the 
-    // native keyboard mapping of the keyboard is used.
-    //
-
-    CONFIG_VARIABLE_INT(vanilla_keyboard_mapping,  vanilla_keyboard_mapping),
-
-    //!
-    // Name of the SDL video driver to use.  If this is an empty string,
-    // the default video driver is used.
-    //
-
-    CONFIG_VARIABLE_STRING(video_driver,           video_driver),
-
-#ifdef FEATURE_MULTIPLAYER
-
-    //!
-    // Name to use in network games for identification.  This is only 
-    // used on the "waiting" screen while waiting for the game to start.
-    //
-
-    CONFIG_VARIABLE_STRING(player_name,            net_player_name),
-
-#endif
-
-    //!
-    // Joystick number to use; '0' is the first joystick.  A negative
-    // value ('-1') indicates that no joystick is configured.
-    //
-
-    CONFIG_VARIABLE_INT(joystick_index,            joystick_index),
-
-    //!
-    // Joystick axis to use to for horizontal (X) movement.
-    //
-
-    CONFIG_VARIABLE_INT(joystick_x_axis,           joystick_x_axis),
-
-    //!
-    // If non-zero, movement on the horizontal joystick axis is inverted.
-    //
-
-    CONFIG_VARIABLE_INT(joystick_x_invert,         joystick_x_invert),
-
-    //!
-    // Joystick axis to use to for vertical (Y) movement.
-    //
-
-    CONFIG_VARIABLE_INT(joystick_y_axis,           joystick_y_axis),
-
-    //!
-    // If non-zero, movement on the vertical joystick axis is inverted.
-    //
-
-    CONFIG_VARIABLE_INT(joystick_y_invert,         joystick_y_invert),
-
-    //!
-    // Joystick button to strafe left.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_strafeleft,           joybstrafeleft),
-
-    //!
-    // Joystick button to strafe right.
-    //
-
-    CONFIG_VARIABLE_INT(joyb_straferight,          joybstraferight),
-
-    //!
-    // Mouse button to strafe left.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_strafeleft,         mousebstrafeleft),
-
-    //!
-    // Mouse button to strafe right.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_straferight,        mousebstraferight),
-
-    //!
-    // Mouse button to "use" an object, eg. a door or switch.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_use,                mousebuse),
-
-    //!
-    // Mouse button to move backwards.
-    //
-
-    CONFIG_VARIABLE_INT(mouseb_backward,           mousebbackward),
-
-    //!
-    // If non-zero, double-clicking a mouse button acts like pressing
-    // the "use" key to use an object in-game, eg. a door or switch.
-    //
-
-    CONFIG_VARIABLE_INT(dclick_use,                dclick_use),
-
-    //!
-    // If non-zero, libsamplerate is used to resample sound effects to
-    // the output sample rate.  This has no effect if libsamplerate
-    // support has not been compiled into the game.
-    //
-
-    CONFIG_VARIABLE_INT(use_libsamplerate,         use_libsamplerate),
-};
-
-static default_collection_t extra_defaults =
-{
-    extra_defaults_list,
-    arrlen(extra_defaults_list),
-    NULL,
-};
-
-static const int scantokey[128] =
-{
-    0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6',
-    '7',    '8',    '9',    '0',    '-',    '=',    KEY_BACKSPACE, 9,
-    'q',    'w',    'e',    'r',    't',    'y',    'u',    'i',
-    'o',    'p',    '[',    ']',    13,		KEY_RCTRL, 'a',    's',
-    'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';',
-    '\'',   '`',    KEY_RSHIFT,'\\',   'z',    'x',    'c',    'v',
-    'b',    'n',    'm',    ',',    '.',    '/',    KEY_RSHIFT,KEYP_MULTIPLY,
-    KEY_RALT,  ' ',  KEY_CAPSLOCK,KEY_F1,  KEY_F2,   KEY_F3,   KEY_F4,   KEY_F5,
-    KEY_F6,   KEY_F7,   KEY_F8,   KEY_F9,   KEY_F10,  KEY_PAUSE,KEY_SCRLCK,KEY_HOME,
-    KEY_UPARROW,KEY_PGUP,KEY_MINUS,KEY_LEFTARROW,KEYP_5,KEY_RIGHTARROW,KEYP_PLUS,KEY_END,
-    KEY_DOWNARROW,KEY_PGDN,KEY_INS,KEY_DEL,0,   0,      0,      KEY_F11,
-    KEY_F12,  0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0,
-    0,      0,      0,      0,      0,      0,      0,      0
-};
-
-
-static void SaveDefaultCollection(default_collection_t *collection)
-{
-    default_t *defaults;
-    int i, v;
-    FILE *f;
-	
-    f = fopen (collection->filename, "w");
-    if (!f)
-	return; // can't write the file, but don't complain
-
-    defaults = collection->defaults;
-		
-    for (i=0 ; i<collection->numdefaults ; i++)
-    {
-        int chars_written;
-
-        // Print the name and line up all values at 30 characters
-
-        chars_written = fprintf(f, "%s ", defaults[i].name);
-
-        for (; chars_written < 30; ++chars_written)
-            fprintf(f, " ");
-
-        // Print the value
-
-        switch (defaults[i].type) 
-        {
-            case DEFAULT_KEY:
-
-                // use the untranslated version if we can, to reduce
-                // the possibility of screwing up the user's config
-                // file
-                
-                v = * (int *) defaults[i].location;
-
-                if (defaults[i].untranslated
-                 && v == defaults[i].original_translated)
-                {
-                    // Has not been changed since the last time we
-                    // read the config file.
-
-                    v = defaults[i].untranslated;
-                }
-                else
-                {
-                    // search for a reverse mapping back to a scancode
-                    // in the scantokey table
-
-                    int s;
-
-                    for (s=0; s<128; ++s)
-                    {
-                        if (scantokey[s] == v)
-                        {
-                            v = s;
-                            break;
-                        }
-                    }
-                }
-
-	        fprintf(f, "%i", v);
-                break;
-
-            case DEFAULT_INT:
-	        fprintf(f, "%i", * (int *) defaults[i].location);
-                break;
-
-            case DEFAULT_FLOAT:
-                fprintf(f, "%f", * (float *) defaults[i].location);
-                break;
-
-            case DEFAULT_STRING:
-	        fprintf(f,"\"%s\"", * (char **) (defaults[i].location));
-                break;
-        }
-
-        fprintf(f, "\n");
-    }
-
-    fclose (f);
-}
-
-// Parses integer values in the configuration file
-
-static int ParseIntParameter(char *strparm)
-{
-    int parm;
-
-    if (strparm[0] == '0' && strparm[1] == 'x')
-        sscanf(strparm+2, "%x", &parm);
-    else
-        sscanf(strparm, "%i", &parm);
-
-    return parm;
-}
-
-static void LoadDefaultCollection(default_collection_t *collection)
-{
-    default_t  *defaults = collection->defaults;
-    int		i;
-    FILE*	f;
-    char	defname[80];
-    char	strparm[100];
-
-    // read the file in, overriding any set defaults
-    f = fopen(collection->filename, "r");
-
-    if (!f)
-    {
-        // File not opened, but don't complain
-
-        return;
-    }
-    
-    while (!feof(f))
-    {
-        if (fscanf (f, "%79s %[^\n]\n", defname, strparm) != 2)
-        {
-            // This line doesn't match
-          
-            continue;
-        }
-
-        // Strip off trailing non-printable characters (\r characters
-        // from DOS text files)
-
-        while (strlen(strparm) > 0 && !isprint(strparm[strlen(strparm)-1]))
-        {
-            strparm[strlen(strparm)-1] = '\0';
-        }
-        
-        // Find the setting in the list
-       
-        for (i=0; i<collection->numdefaults; ++i)
-        {
-            default_t *def = &collection->defaults[i];
-            char *s;
-            int intparm;
-
-            if (strcmp(defname, def->name) != 0)
-            {
-                // not this one
-                continue;
-            }
-
-            // parameter found
-
-            switch (def->type)
-            {
-                case DEFAULT_STRING:
-                    s = strdup(strparm + 1);
-                    s[strlen(s) - 1] = '\0';
-                    * (char **) def->location = s;
-                    break;
-
-                case DEFAULT_INT:
-                    * (int *) def->location = ParseIntParameter(strparm);
-                    break;
-
-                case DEFAULT_KEY:
-
-                    // translate scancodes read from config
-                    // file (save the old value in untranslated)
-
-                    intparm = ParseIntParameter(strparm);
-                    defaults[i].untranslated = intparm;
-                    intparm = scantokey[intparm];
-
-                    defaults[i].original_translated = intparm;
-                    * (int *) def->location = intparm;
-                    break;
-
-                case DEFAULT_FLOAT:
-                    * (float *) def->location = (float) atof(strparm);
-                    break;
-            }
-
-            // finish
-
-            break; 
-        }
-    }
-            
-    fclose (f);
-}
-
-//
-// M_SaveDefaults
-//
-
-void M_SaveDefaults (void)
-{
-    SaveDefaultCollection(&doom_defaults);
-    SaveDefaultCollection(&extra_defaults);
-}
-
-
-//
-// M_LoadDefaults
-//
-
-void M_LoadDefaults (void)
-{
-    int i;
- 
-    // check for a custom default file
-
-    //!
-    // @arg <file>
-    // @vanilla
-    //
-    // Load configuration from the specified file, instead of
-    // default.cfg.
-    //
-
-    i = M_CheckParm ("-config");
-
-    if (i && i<myargc-1)
-    {
-	doom_defaults.filename = myargv[i+1];
-	printf ("	default file: %s\n",doom_defaults.filename);
-    }
-    else
-    {
-        doom_defaults.filename = malloc(strlen(configdir) + 20);
-        sprintf(doom_defaults.filename, "%sdefault.cfg", configdir);
-    }
-
-    printf("saving config in %s\n", doom_defaults.filename);
-
-    //!
-    // @arg <file>
-    //
-    // Load extra configuration from the specified file, instead 
-    // of chocolate-doom.cfg.
-    //
-
-    i = M_CheckParm("-extraconfig");
-
-    if (i && i<myargc-1)
-    {
-        extra_defaults.filename = myargv[i+1];
-        printf("        extra configuration file: %s\n", 
-               extra_defaults.filename);
-    }
-    else
-    {
-        extra_defaults.filename 
-            = malloc(strlen(configdir) + strlen(PACKAGE_TARNAME) + 10);
-        sprintf(extra_defaults.filename, "%s%s.cfg", 
-                configdir, PACKAGE_TARNAME);
-    }
-
-    LoadDefaultCollection(&doom_defaults);
-    LoadDefaultCollection(&extra_defaults);
-}
-
-// 
-// SetConfigDir:
-//
-// Sets the location of the configuration directory, where configuration
-// files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
-//
-
-void M_SetConfigDir(void)
-{
-#ifndef _WIN32
-    // Ignore the HOME environment variable on Windows - just behave
-    // like Vanilla Doom.
-
-    char *homedir;
-
-    homedir = getenv("HOME");
-
-    if (homedir != NULL)
-    {
-        // put all configuration in a config directory off the
-        // homedir
-
-        configdir = malloc(strlen(homedir) + strlen(PACKAGE_TARNAME) + 5);
-
-        sprintf(configdir, "%s%c.%s%c", homedir, DIR_SEPARATOR,
-			                PACKAGE_TARNAME, DIR_SEPARATOR);
-
-        // make the directory if it doesnt already exist
-
-        M_MakeDirectory(configdir);
-    }
-    else
-#endif /* #ifndef _WIN32 */
-    {
-#ifdef _WIN32
-        //!
-        // @platform windows
-        // @vanilla
-        //
-        // Save configuration data and savegames in c:\doomdata,
-        // allowing play from CD.
-        //
-
-        if (M_CheckParm("-cdrom") > 0)
-        {
-            printf(D_CDROM);
-            configdir = strdup("c:\\doomdata\\");
-
-            M_MakeDirectory(configdir);
-        }
-        else
-#endif
-        {
-            configdir = strdup("");
-        }
-    }
-}
-
-
-
-//
-// SCREEN SHOTS
-//
-
-
-typedef struct
-{
-    char		manufacturer;
-    char		version;
-    char		encoding;
-    char		bits_per_pixel;
-
-    unsigned short	xmin;
-    unsigned short	ymin;
-    unsigned short	xmax;
-    unsigned short	ymax;
-    
-    unsigned short	hres;
-    unsigned short	vres;
-
-    unsigned char	palette[48];
-    
-    char		reserved;
-    char		color_planes;
-    unsigned short	bytes_per_line;
-    unsigned short	palette_type;
-    
-    char		filler[58];
-    unsigned char	data;		// unbounded
-} PACKEDATTR pcx_t;
-
-
-//
-// WritePCXfile
-//
-void
-WritePCXfile
-( char*		filename,
-  byte*		data,
-  int		width,
-  int		height,
-  byte*		palette )
-{
-    int		i;
-    int		length;
-    pcx_t*	pcx;
-    byte*	pack;
-	
-    pcx = Z_Malloc (width*height*2+1000, PU_STATIC, NULL);
-
-    pcx->manufacturer = 0x0a;		// PCX id
-    pcx->version = 5;			// 256 color
-    pcx->encoding = 1;			// uncompressed
-    pcx->bits_per_pixel = 8;		// 256 color
-    pcx->xmin = 0;
-    pcx->ymin = 0;
-    pcx->xmax = SHORT(width-1);
-    pcx->ymax = SHORT(height-1);
-    pcx->hres = SHORT(width);
-    pcx->vres = SHORT(height);
-    memset (pcx->palette,0,sizeof(pcx->palette));
-    pcx->color_planes = 1;		// chunky image
-    pcx->bytes_per_line = SHORT(width);
-    pcx->palette_type = SHORT(2);	// not a grey scale
-    memset (pcx->filler,0,sizeof(pcx->filler));
-
-
-    // pack the image
-    pack = &pcx->data;
-	
-    for (i=0 ; i<width*height ; i++)
-    {
-	if ( (*data & 0xc0) != 0xc0)
-	    *pack++ = *data++;
-	else
-	{
-	    *pack++ = 0xc1;
-	    *pack++ = *data++;
-	}
-    }
-    
-    // write the palette
-    *pack++ = 0x0c;	// palette ID byte
-    for (i=0 ; i<768 ; i++)
-	*pack++ = *palette++;
-    
-    // write output file
-    length = pack - (byte *)pcx;
-    M_WriteFile (filename, pcx, length);
-
-    Z_Free (pcx);
-}
-
-//
-// M_ScreenShot
-//
-void M_ScreenShot (void)
-{
-    int		i;
-    byte*	linear;
-    char	lbmname[12];
-    
-    // munge planar buffer to linear
-    linear = screens[2];
-    I_ReadScreen (linear);
-    
-    // find a file name to save it to
-    strcpy(lbmname,"DOOM00.pcx");
-		
-    for (i=0 ; i<=99 ; i++)
-    {
-	lbmname[4] = i/10 + '0';
-	lbmname[5] = i%10 + '0';
-	if (!M_FileExists(lbmname))
-	    break;	// file doesn't exist
-    }
-    if (i==100)
-	I_Error ("M_ScreenShot: Couldn't create a PCX");
-    
-    // save the pcx file
-    WritePCXfile (lbmname, linear,
-		  SCREENWIDTH, SCREENHEIGHT,
-		  W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
-	
-    players[consoleplayer].message = DEH_String("screen shot");
-}
-
-
diff --git a/src/m_misc.h b/src/m_misc.h
index b3412e9c..0fea7e92 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -20,7 +20,7 @@
 // 02111-1307, USA.
 //
 // DESCRIPTION:
-//
+//      Miscellaneous.
 //    
 //-----------------------------------------------------------------------------
 
@@ -29,46 +29,16 @@
 #define __M_MISC__
 
 
-#include "doomtype.h"
-//
-// MISC
-//
-
-
-
-boolean
-M_WriteFile
-( char const*	name,
-  void*		source,
-  int		length );
-
-int
-M_ReadFile
-( char const*	name,
-  byte**	buffer );
-
-void M_ScreenShot (void);
+#include <stdio.h>
 
-void M_LoadDefaults (void);
-
-void M_SaveDefaults (void);
-
-void M_SetConfigDir(void);
+#include "doomtype.h"
 
+boolean M_WriteFile(char *name, void *source, int length);
+int M_ReadFile(char *name, byte **buffer);
 void M_MakeDirectory(char *dir);
-
 char *M_TempFile(char *s);
-
 boolean M_FileExists(char *file);
-
-
-int
-M_DrawText
-( int		x,
-  int		y,
-  boolean	direct,
-  char*		string );
-
-extern char *configdir;
+long M_FileLength(FILE *handle);
 
 #endif
+
diff --git a/src/v_video.c b/src/v_video.c
index a4a556bf..82d9f357 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -35,11 +35,13 @@
 #include "doomdef.h"
 #include "doomdata.h"
 
+#include "deh_main.h"
 #include "m_bbox.h"
 #include "i_swap.h"
-
+#include "i_video.h"
+#include "m_misc.h"
 #include "v_video.h"
-
+#include "w_wad.h"
 #include "z_zone.h"
 
 // Each screen is [SCREENWIDTH*SCREENHEIGHT]; 
@@ -493,3 +495,124 @@ void V_Init (void)
     }
 }
 
+//
+// SCREEN SHOTS
+//
+
+typedef struct
+{
+    char		manufacturer;
+    char		version;
+    char		encoding;
+    char		bits_per_pixel;
+
+    unsigned short	xmin;
+    unsigned short	ymin;
+    unsigned short	xmax;
+    unsigned short	ymax;
+    
+    unsigned short	hres;
+    unsigned short	vres;
+
+    unsigned char	palette[48];
+    
+    char		reserved;
+    char		color_planes;
+    unsigned short	bytes_per_line;
+    unsigned short	palette_type;
+    
+    char		filler[58];
+    unsigned char	data;		// unbounded
+} PACKEDATTR pcx_t;
+
+
+//
+// WritePCXfile
+//
+
+void WritePCXfile(char *filename, byte *data,
+                  int width, int height,
+                  byte *palette)
+{
+    int		i;
+    int		length;
+    pcx_t*	pcx;
+    byte*	pack;
+	
+    pcx = Z_Malloc (width*height*2+1000, PU_STATIC, NULL);
+
+    pcx->manufacturer = 0x0a;		// PCX id
+    pcx->version = 5;			// 256 color
+    pcx->encoding = 1;			// uncompressed
+    pcx->bits_per_pixel = 8;		// 256 color
+    pcx->xmin = 0;
+    pcx->ymin = 0;
+    pcx->xmax = SHORT(width-1);
+    pcx->ymax = SHORT(height-1);
+    pcx->hres = SHORT(width);
+    pcx->vres = SHORT(height);
+    memset (pcx->palette,0,sizeof(pcx->palette));
+    pcx->color_planes = 1;		// chunky image
+    pcx->bytes_per_line = SHORT(width);
+    pcx->palette_type = SHORT(2);	// not a grey scale
+    memset (pcx->filler,0,sizeof(pcx->filler));
+
+    // pack the image
+    pack = &pcx->data;
+	
+    for (i=0 ; i<width*height ; i++)
+    {
+	if ( (*data & 0xc0) != 0xc0)
+	    *pack++ = *data++;
+	else
+	{
+	    *pack++ = 0xc1;
+	    *pack++ = *data++;
+	}
+    }
+    
+    // write the palette
+    *pack++ = 0x0c;	// palette ID byte
+    for (i=0 ; i<768 ; i++)
+	*pack++ = *palette++;
+    
+    // write output file
+    length = pack - (byte *)pcx;
+    M_WriteFile (filename, pcx, length);
+
+    Z_Free (pcx);
+}
+
+//
+// V_ScreenShot
+//
+
+void V_ScreenShot (void)
+{
+    int		i;
+    byte*	linear;
+    char	lbmname[12];
+    
+    // munge planar buffer to linear
+    linear = screens[2];
+    I_ReadScreen (linear);
+    
+    // find a file name to save it to
+    strcpy(lbmname,"DOOM00.pcx");
+		
+    for (i=0 ; i<=99 ; i++)
+    {
+	lbmname[4] = i/10 + '0';
+	lbmname[5] = i%10 + '0';
+	if (!M_FileExists(lbmname))
+	    break;	// file doesn't exist
+    }
+    if (i==100)
+	I_Error ("V_ScreenShot: Couldn't create a PCX");
+    
+    // save the pcx file
+    WritePCXfile (lbmname, linear,
+		  SCREENWIDTH, SCREENHEIGHT,
+		  W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE));
+}
+
diff --git a/src/v_video.h b/src/v_video.h
index bda26038..3782b4eb 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -116,4 +116,6 @@ V_MarkRect
   int		width,
   int		height );
 
+void V_ScreenShot(void);
+
 #endif
diff --git a/src/w_wad.c b/src/w_wad.c
index 2d58b574..a93ae377 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -38,6 +38,7 @@
 #include "i_swap.h"
 #include "i_system.h"
 #include "i_video.h"
+#include "m_misc.h"
 #include "z_zone.h"
 
 #include "w_wad.h"
@@ -71,24 +72,6 @@ unsigned int numlumps = 0;
 
 static lumpinfo_t **lumphash;
 
-static int FileLength (FILE *handle)
-{ 
-    long savedpos;
-    long length;
-    // save the current position in the file
-    savedpos = ftell(handle);
-    
-    // jump to the end and find the length
-    fseek(handle, 0, SEEK_END);
-    length = ftell(handle);
-
-    // go back to the old location
-    fseek(handle, savedpos, SEEK_SET);
-
-    return length;
-}
-
-
 static void ExtractFileBase(char *path, char *dest)
 {
     char*	src;
@@ -195,7 +178,7 @@ FILE *W_AddFile (char *filename)
 
 	fileinfo = Z_Malloc(sizeof(filelump_t), PU_STATIC, 0);
 	fileinfo->filepos = LONG(0);
-	fileinfo->size = LONG(FileLength(handle));
+	fileinfo->size = LONG(M_FileLength(handle));
 
         // Name the lump after the base of the filename (without the
         // extension).