diff options
Diffstat (limited to 'src/setup/mainmenu.c')
-rw-r--r-- | src/setup/mainmenu.c | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c index 7564fe36..1a82b507 100644 --- a/src/setup/mainmenu.c +++ b/src/setup/mainmenu.c @@ -28,9 +28,9 @@ #include "m_argv.h" #include "m_config.h" -#include "m_controls.h" #include "setup_icon.c" +#include "mode.h" #include "compatibility.h" #include "display.h" @@ -40,19 +40,6 @@ #include "multiplayer.h" #include "sound.h" -// Miscellaneous variables that aren't used in setup. - -static int showMessages = 1; -static int screenblocks = 9; -static int detailLevel = 0; - -static void BindMiscVariables(void) -{ - M_BindVariable("show_messages", &showMessages); - M_BindVariable("screenblocks", &screenblocks); - M_BindVariable("detaillevel", &detailLevel); -} - static void DoQuit(void *widget, void *dosave) { if (dosave != NULL) @@ -146,31 +133,14 @@ void MainMenu(void) TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action); } -// -// Initialise all configuration variables, load config file, etc -// - static void InitConfig(void) { + SetupMission(); + InitBindings(); + SetChatMacroDefaults(); SetPlayerNameDefault(); - // Keyboard, mouse, joystick controls - - M_BindBaseControls(); - - // All other variables - - BindCompatibilityVariables(); - BindDisplayVariables(); - BindJoystickVariables(); - BindKeyboardVariables(); - BindMouseVariables(); - BindSoundVariables(); - BindMiscVariables(); - BindMultiplayerVariables(); - - M_SetConfigFilenames("default.cfg", "chocolate-doom.cfg"); M_SetConfigDir(); M_LoadDefaults(); } |