Fix Konami code.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2445

9 files changed, 32 insertions, 16 deletions

diff --git a/src/setup/compatibility.h b/src/setup/compatibility.h
index 386a4798..41c6ecd1 100644
--- a/src/setup/compatibility.h
+++ b/src/setup/compatibility.h
@@ -25,5 +25,7 @@
 void CompatibilitySettings(void);
 void BindCompatibilityVariables(void);
 
-#endif /* #ifndef SETUP_COMPATIBILITY_H */
+extern int vanilla_savegame_limit;
+extern int vanilla_demo_limit;
 
+#endif /* #ifndef SETUP_COMPATIBILITY_H */
diff --git a/src/setup/display.c b/src/setup/display.c
index ebd747e0..92b436b7 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -109,10 +109,11 @@ static int screen_width = 320;
 static int screen_height = 200;
 static int screen_bpp = 8;
 static int startup_delay = 1000;
-static int graphical_startup = 1;
-static int show_endoom = 1;
 static int usegamma = 0;
 
+int graphical_startup = 1;
+int show_endoom = 1;
+
 // These are the last screen width/height values that were chosen by the
 // user.  These are used when finding the "nearest" mode, so when 
 // changing the fullscreen / aspect ratio options, the setting does not
@@ -824,4 +825,3 @@ void BindDisplayVariables(void)
     }
 #endif
 }
-
diff --git a/src/setup/display.h b/src/setup/display.h
index 2c17d8c4..a5c0c8bf 100644
--- a/src/setup/display.h
+++ b/src/setup/display.h
@@ -26,5 +26,7 @@ void ConfigDisplay(void);
 void SetDisplayDriver(void);
 void BindDisplayVariables(void);
 
-#endif /* #ifndef SETUP_DISPLAY_H */
+extern int show_endoom;
+extern int graphical_startup;
 
+#endif /* #ifndef SETUP_DISPLAY_H */
diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c
index 3f9f6d89..4c74fd4e 100644
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -31,7 +31,7 @@
 #include "joystick.h"
 #include "keyboard.h"
 
-static int vanilla_keyboard_mapping = 1;
+int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
 
@@ -385,4 +385,3 @@ void BindKeyboardVariables(void)
 {
     M_BindVariable("vanilla_keyboard_mapping", &vanilla_keyboard_mapping);
 }
-
diff --git a/src/setup/keyboard.h b/src/setup/keyboard.h
index 12059bf8..5ca4bac6 100644
--- a/src/setup/keyboard.h
+++ b/src/setup/keyboard.h
@@ -25,5 +25,6 @@
 void ConfigKeyboard(void);
 void BindKeyboardVariables(void);
 
-#endif /* #ifndef SETUP_KEYBOARD_H */
+extern int vanilla_keyboard_mapping;
 
+#endif /* #ifndef SETUP_KEYBOARD_H */
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();
 }
-
diff --git a/src/setup/mouse.c b/src/setup/mouse.c
index 5b555f88..76ded3dd 100644
--- a/src/setup/mouse.c
+++ b/src/setup/mouse.c
@@ -34,12 +34,13 @@
 
 static int usemouse = 1;
 
-static int novert = 0;
 static int mouseSensitivity = 5;
 static float mouse_acceleration = 2.0;
 static int mouse_threshold = 10;
 static int grabmouse = 1;
 
+int novert = 0;
+
 static int *all_mouse_buttons[] = {
     &mousebfire,
     &mousebstrafe,
@@ -166,4 +167,3 @@ void BindMouseVariables(void)
     M_BindVariable("mouse_threshold",      &mouse_threshold);
     M_BindVariable("grabmouse",            &grabmouse);
 }
-
diff --git a/src/setup/mouse.h b/src/setup/mouse.h
index cdaa541a..70def18a 100644
--- a/src/setup/mouse.h
+++ b/src/setup/mouse.h
@@ -25,5 +25,6 @@
 void ConfigMouse(void);
 void BindMouseVariables(void);
 
-#endif /* #ifndef SETUP_MOUSE_H */
+extern int novert;
 
+#endif /* #ifndef SETUP_MOUSE_H */
diff --git a/src/setup/sound.h b/src/setup/sound.h
index 0b183502..87317589 100644
--- a/src/setup/sound.h
+++ b/src/setup/sound.h
@@ -25,5 +25,6 @@
 void ConfigSound(void);
 void BindSoundVariables(void);
 
-#endif /* #ifndef SETUP_SOUND_H */
+extern int snd_musicdevice;
 
+#endif /* #ifndef SETUP_SOUND_H */