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

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

4 files changed, 13 insertions, 12 deletions

diff --git a/setup/display.c b/setup/display.c
index b53608db..cecd7e12 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -48,6 +48,7 @@ static vidmode_t modes[] =
 
 static int vidmode = 0;
 
+int autoadjust_video_settings = 1;
 int fullscreen = 0;
 int screenmultiply = 1;
 int startup_delay = 0;
diff --git a/setup/mouse.c b/setup/mouse.c
index 1861a1d9..2dbec612 100644
--- a/setup/mouse.c
+++ b/setup/mouse.c
@@ -28,7 +28,7 @@
 
 #include "mouse.h"
 
-int use_mouse = 1;
+int usemouse = 1;
 
 int novert = 0;
 int mouseSensitivity = 5;
@@ -82,7 +82,7 @@ void ConfigMouse(void)
     window = TXT_NewWindow("Mouse configuration");
 
     TXT_AddWidgets(window,
-                   TXT_NewCheckBox("Enable mouse", &use_mouse),
+                   TXT_NewCheckBox("Enable mouse", &usemouse),
                    TXT_NewInvertedCheckBox("Allow vertical mouse movement", 
                                            &novert),
                    TXT_NewCheckBox("Grab mouse in windowed mode", 
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index af73e30f..2ae143ba 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -53,7 +53,7 @@ static char *gamemodes[] =
 };
 
 char *player_name;
-char *chatmacros[10];
+char *chat_macros[10];
 
 static char *wads[NUM_WADS] = {};
 static char *extra_params[NUM_EXTRA_PARAMS] = {};
@@ -334,9 +334,9 @@ static void SetChatMacroDefaults(void)
 
     for (i=0; i<10; ++i)
     {
-        if (chatmacros[i] == NULL)
+        if (chat_macros[i] == NULL)
         {
-            chatmacros[i] = strdup(defaults[i]);
+            chat_macros[i] = strdup(defaults[i]);
         }
     }
 }
@@ -392,7 +392,7 @@ void MultiplayerConfig(void)
 
         TXT_AddWidgets(table,
                        label,
-                       TXT_NewInputBox(&chatmacros[i], 40),
+                       TXT_NewInputBox(&chat_macros[i], 40),
                        NULL);
     }
     
diff --git a/setup/sound.c b/setup/sound.c
index e8e05277..d5a61ac4 100644
--- a/setup/sound.c
+++ b/setup/sound.c
@@ -28,11 +28,11 @@
 #include "sound.h"
 
 int snd_sfxdevice = 3;
-int snd_channels = 8;
-int sfx_volume = 15;
+int numChannels = 8;
+int sfxVolume = 15;
 
 int snd_musicdevice = 3;
-int music_volume = 15;
+int musicVolume = 15;
 
 static int snd_sfxenabled;
 static int snd_musicenabled;
@@ -91,16 +91,16 @@ void ConfigSound(void)
 
     TXT_AddWidgets(sfx_table, 
                    TXT_NewLabel("Sound channels"),
-                   TXT_NewSpinControl(&snd_channels, 1, 8),
+                   TXT_NewSpinControl(&numChannels, 1, 8),
                    TXT_NewLabel("SFX volume"),
-                   TXT_NewSpinControl(&sfx_volume, 0, 15),
+                   TXT_NewSpinControl(&sfxVolume, 0, 15),
                    NULL);
 
     TXT_SetColumnWidths(music_table, 20, 5);
 
     TXT_AddWidgets(music_table,
                    TXT_NewLabel("Music volume"),
-                   TXT_NewSpinControl(&music_volume, 0, 15),
+                   TXT_NewSpinControl(&musicVolume, 0, 15),
                    NULL);
 }