commit 6ffcadb705613e2a4443f0a129a0191c897485eb
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Oct 23 17:57:56 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Oct 23 17:57:56 2006 +0000

    Change config variable names to be the same as used in Doom.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 716
---
 setup/display.h     | 1 +
 setup/mouse.h       | 2 +-
 setup/multiplayer.h | 2 +-
 setup/sound.h       | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup/display.h b/setup/display.h
index af8bb3b5..50270724 100644
--- a/setup/display.h
+++ b/setup/display.h
@@ -22,6 +22,7 @@
 #ifndef SETUP_DISPLAY_H
 #define SETUP_DISPLAY_H

+extern int autoadjust_video_settings;
 extern int fullscreen;
 extern int screenmultiply;
 extern int startup_delay;
diff --git a/setup/mouse.h b/setup/mouse.h
index 60ab4f09..445a50c7 100644
--- a/setup/mouse.h
+++ b/setup/mouse.h
@@ -22,7 +22,7 @@
 #ifndef SETUP_MOUSE_H
 #define SETUP_MOUSE_H

-extern int use_mouse;
+extern int usemouse;

 extern int novert;
 extern int mouseSensitivity;
diff --git a/setup/multiplayer.h b/setup/multiplayer.h
index a9714058..6c8ea299 100644
--- a/setup/multiplayer.h
+++ b/setup/multiplayer.h
@@ -23,7 +23,7 @@
 #define SETUP_MULTIPLAYER_H

 extern char *player_name;
-extern char *chatmacros[10];
+extern char *chat_macros[10];

 void StartMultiGame(void);
 void JoinMultiGame(void);
diff --git a/setup/sound.h b/setup/sound.h
index 8ffbd907..8a039f68 100644
--- a/setup/sound.h
+++ b/setup/sound.h
@@ -23,11 +23,11 @@
 #define SETUP_SOUND_H

 extern int snd_sfxdevice;
-extern int snd_channels;
-extern int sfx_volume;
+extern int numChannels;
+extern int sfxVolume;

 extern int snd_musicdevice;
-extern int music_volume;
+extern int musicVolume;

 void ConfigSound(void);