Standardise setup config variable names on the same variable names used

in Doom. Add header files for source files where they are needed. Make
variables static where appropriate. General cleanups etc.

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

1 files changed, 7 insertions, 9 deletions

diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 7aaef574..9721c25e 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -23,6 +23,13 @@
 #include "config.h"
 #include "textscreen.h"
 
+#include "compatibility.h"
+#include "display.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "multiplayer.h"
+#include "sound.h"
+
 void DoQuit(void *widget, void *dosave)
 {
     if (dosave != NULL)
@@ -61,15 +68,6 @@ void QuitConfirm(void *unused1, void *unused2)
     TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
 }
 
-extern void ConfigDisplay();
-extern void ConfigKeyboard();
-extern void ConfigMouse();
-extern void ConfigSound();
-extern void CompatibilitySettings();
-extern void StartMultiGame();
-extern void JoinMultiGame();
-extern void MultiplayerConfig();
-
 void MainMenu(void)
 {
     txt_window_t *window;