Switch configuration file code to common configuration file code, and

remove old code.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1338

1 files changed, 21 insertions, 4 deletions

diff --git a/src/m_controls.c b/src/m_controls.c
index 62cad830..f24f6dda 100644
--- a/src/m_controls.c
+++ b/src/m_controls.c
@@ -25,10 +25,10 @@
 #include "doomkeys.h"
 
 #include "m_config.h"
- 
-// 
-// Keyboard controls 
-// 
+
+//
+// Keyboard controls
+//
 
 int key_right = KEY_RIGHTARROW;
 int key_left = KEY_LEFTARROW;
@@ -59,6 +59,12 @@ int key_invright = ']';
 int key_useartifact = KEY_ENTER;
 
 //
+// Hexen key controls
+//
+
+int key_jump = '/';
+
+//
 // Mouse controls
 //
 
@@ -66,6 +72,8 @@ int mousebfire = 0;
 int mousebstrafe = 1;
 int mousebforward = 2;
 
+int mousebjump = -1;
+
 int mousebstrafeleft = -1;
 int mousebstraferight = -1;
 int mousebbackward = -1;
@@ -83,6 +91,8 @@ int joybspeed = 2;
 int joybstrafeleft = -1;
 int joybstraferight = -1;
 
+int joybjump = -1;
+
 // Control whether if a mouse button is double clicked, it acts like 
 // "use" has been pressed
 
@@ -140,3 +150,10 @@ void M_BindHereticControls(void)
     M_BindVariable("key_useartifact",    &key_useartifact);
 }
 
+void M_BindHexenControls(void)
+{
+    M_BindVariable("key_jump",           &key_jump);
+    M_BindVariable("mouseb_jump",        &mousebjump);
+    M_BindVariable("joyb_jump",          &joybjump);
+}
+