"Always run" trick should only be when joyb_speed >= 10. Use 29 as the

ideal value in setup as this works in Original, Ultimate and Final Doom,
Heretic, Hexen and Strife. Thanks to Janizdreg for this.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 739

2 files changed, 11 insertions, 3 deletions

diff --git a/setup/keyboard.c b/setup/keyboard.c
index 0b434859..b804714f 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -47,7 +47,15 @@ static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
 {
     if (always_run)
     {
-       joybspeed = 31;
+        /*
+         <Janizdreg> if you want to pick one for chocolate doom to use, 
+                     pick 29, since that is the most universal one that 
+                     also works with heretic, hexen and strife =P
+
+         NB. This choice also works with original, ultimate and final exes.
+        */
+
+        joybspeed = 29;
     }
     else
     {
@@ -92,7 +100,7 @@ void ConfigKeyboard(void)
     txt_table_t *action_table;
     txt_checkbox_t *run_control;
 
-    always_run = joybspeed > 30;
+    always_run = joybspeed >= 10;
 
     window = TXT_NewWindow("Keyboard configuration");
 
diff --git a/src/g_game.c b/src/g_game.c
index 6a46980a..971b7855 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -392,7 +392,7 @@ void G_BuildTiccmd (ticcmd_t* cmd)
     // allowed an autorun effect
 
     speed = key_speed >= NUMKEYS
-         || joybspeed >= 4
+         || joybspeed >= 10
          || gamekeydown[key_speed] 
          || joybuttons[joybspeed];