summaryrefslogtreecommitdiff
path: root/src/setup/mainmenu.c
diff options
context:
space:
mode:
authorSimon Howard2011-10-20 21:13:35 +0000
committerSimon Howard2011-10-20 21:13:35 +0000
commitabfc7bfe709000c1ca82654b64e6b43d3e06308a (patch)
tree39ef2bb0b10725ba65e48d427f6c835eb9ef3a56 /src/setup/mainmenu.c
parentd6693cc9e17fdbee7033e47b7b8da249da118d8f (diff)
downloadchocolate-doom-abfc7bfe709000c1ca82654b64e6b43d3e06308a.tar.gz
chocolate-doom-abfc7bfe709000c1ca82654b64e6b43d3e06308a.tar.bz2
chocolate-doom-abfc7bfe709000c1ca82654b64e6b43d3e06308a.zip
Fix Konami code.
Subversion-branch: /branches/v2-branch Subversion-revision: 2445
Diffstat (limited to 'src/setup/mainmenu.c')
-rw-r--r--src/setup/mainmenu.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index 3180e58e..46a53d6e 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -34,6 +34,7 @@
#include "m_argv.h"
#include "m_config.h"
+#include "m_controls.h"
#include "setup_icon.c"
#include "mode.h"
@@ -59,12 +60,22 @@ static unsigned int cheat_sequence_index = 0;
static void SensibleDefaults(void)
{
-#if 0
- // TODO for raven-branch
key_up = 'w';
key_down = 's';
key_strafeleft = 'a';
key_straferight = 'd';
+ key_jump = '/';
+ key_lookup = KEY_PGUP;
+ key_lookdown = KEY_PGDN;
+ key_lookcenter = KEY_HOME;
+ key_flyup = KEY_INS;
+ key_flydown = KEY_DEL;
+ key_flycenter = KEY_END;
+ key_prevweapon = ',';
+ key_nextweapon = '.';
+ key_invleft = '[';
+ key_invright = ']';
+ key_message_refresh = KEY_ENTER;
mousebprevweapon = 4;
mousebnextweapon = 3;
snd_musicdevice = 3;
@@ -72,10 +83,10 @@ static void SensibleDefaults(void)
vanilla_savegame_limit = 0;
vanilla_keyboard_mapping = 0;
vanilla_demo_limit = 0;
+ graphical_startup = 0;
show_endoom = 0;
dclick_use = 0;
novert = 1;
-#endif
}
static int MainMenuKeyPress(txt_window_t *window, int key, void *user_data)
@@ -348,4 +359,3 @@ void D_DoomMain(void)
RunGUI();
}
-