diff options
author | Simon Howard | 2008-11-26 21:09:12 +0000 |
---|---|---|
committer | Simon Howard | 2008-11-26 21:09:12 +0000 |
commit | 2b5de0bafc1ebe347e08617de7595c1ea507c0b9 (patch) | |
tree | d822c7e164353d49e7de1018e9a2219487488cf4 /src/setup/mainmenu.c | |
parent | 2f67325278637a349bb86fa6fc388e527a75a5c9 (diff) | |
download | chocolate-doom-2b5de0bafc1ebe347e08617de7595c1ea507c0b9.tar.gz chocolate-doom-2b5de0bafc1ebe347e08617de7595c1ea507c0b9.tar.bz2 chocolate-doom-2b5de0bafc1ebe347e08617de7595c1ea507c0b9.zip |
Add bindings for remaining missing config file variables, to get
chocolate-setup functional again.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1388
Diffstat (limited to 'src/setup/mainmenu.c')
-rw-r--r-- | src/setup/mainmenu.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c index 1585c96b..7564fe36 100644 --- a/src/setup/mainmenu.c +++ b/src/setup/mainmenu.c @@ -28,6 +28,7 @@ #include "m_argv.h" #include "m_config.h" +#include "m_controls.h" #include "setup_icon.c" @@ -39,12 +40,24 @@ #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) { - // DANGER: this is broken. Do not save. -// M_SaveDefaults(); + M_SaveDefaults(); } exit(0); @@ -142,6 +155,21 @@ static void InitConfig(void) 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(); |