Add run as a mouse-settable control (mouseb_speed) (#466)

coelckers · Feb 6, 2022 · 78102ed · 78102ed
1 parent 4b832c5
commit 78102ed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/prboom2/src/g_game.c b/prboom2/src/g_game.c
@@ -269,6 +269,7 @@ int     mousebbackward;
 int     mousebturnright;
 int     mousebturnleft;
 int     mousebuse;
+int     mousebspeed;
 int     joybfire;
 int     joybstrafe;
 int     joybstrafeleft;
@@ -485,7 +486,7 @@ void G_BuildTiccmd(ticcmd_t* cmd)
   strafe = gamekeydown[key_strafe] || mousebuttons[mousebstrafe]
     || joybuttons[joybstrafe];
   //e6y: the "RUN" key inverts the autorun state
-  speed = (gamekeydown[key_speed] || joybuttons[joybspeed] ? !autorun : autorun); // phares
+  speed = (gamekeydown[key_speed] || joybuttons[joybspeed] || mousebuttons[mousebspeed] ? !autorun : autorun); // phares
 
   forward = side = 0;
 

diff --git a/prboom2/src/g_game.h b/prboom2/src/g_game.h
@@ -200,6 +200,7 @@ extern int  mousebbackward;
 extern int  mousebturnright;
 extern int  mousebturnleft;
 extern int  mousebuse;
+extern int  mousebspeed;
 extern int  joybfire;
 extern int  joybstrafe;
 extern int  joybstrafeleft;

diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c
@@ -2458,7 +2458,7 @@ setup_menu_t keys_settings1[] =  // Key Binding screen strings
   {"BACKWARD"    ,S_KEY       ,m_scrn,KB_X,KB_Y+2*8,{&key_down},&mousebbackward},
   {"TURN LEFT"   ,S_KEY       ,m_scrn,KB_X,KB_Y+3*8,{&key_left},&mousebturnleft},
   {"TURN RIGHT"  ,S_KEY       ,m_scrn,KB_X,KB_Y+4*8,{&key_right},&mousebturnright},
-  {"RUN"         ,S_KEY       ,m_scrn,KB_X,KB_Y+5*8,{&key_speed},0,&joybspeed},
+  {"RUN"         ,S_KEY       ,m_scrn,KB_X,KB_Y+5*8,{&key_speed},&mousebspeed,&joybspeed},
   {"STRAFE LEFT" ,S_KEY       ,m_scrn,KB_X,KB_Y+6*8,{&key_strafeleft},0,&joybstrafeleft},
   {"STRAFE RIGHT",S_KEY       ,m_scrn,KB_X,KB_Y+7*8,{&key_straferight},0,&joybstraferight},
   {"STRAFE"      ,S_KEY       ,m_scrn,KB_X,KB_Y+8*8,{&key_strafe},&mousebstrafe,&joybstrafe},
@@ -4411,7 +4411,7 @@ setup_menu_t helpstrings[] =  // HELP screen strings
   {"BACKWARD"    ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 2*8,{&key_down},&mousebbackward},
   {"TURN LEFT"   ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 3*8,{&key_left},&mousebturnleft},
   {"TURN RIGHT"  ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 4*8,{&key_right},&mousebturnright},
-  {"RUN"         ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 5*8,{&key_speed},0,&joybspeed},
+  {"RUN"         ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 5*8,{&key_speed},&mousebspeed,&joybspeed},
   {"STRAFE LEFT" ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 6*8,{&key_strafeleft},0,&joybstrafeleft},
   {"STRAFE RIGHT",S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 7*8,{&key_straferight},0,&joybstraferight},
   {"STRAFE"      ,S_SKIP|S_KEY,m_null,KT_X3,KT_Y3+ 8*8,{&key_strafe},&mousebstrafe,&joybstrafe},

diff --git a/prboom2/src/m_misc.c b/prboom2/src/m_misc.c
@@ -591,6 +591,8 @@ default_t defaults[] =
    def_int,ss_keys}, // mouse button number to use for turning left
   {"mouseb_use", {&mousebuse},{-1},-1,MAX_MOUSEB,
    def_int,ss_keys}, // mouse button number to use for using doors/switches
+  {"mouseb_speed", {&mousebspeed},{-1},-1,MAX_MOUSEB,
+   def_int,ss_keys},
   //jff 3/8/98 end of lower range change for -1 allowed in mouse binding
 
   {"mb_weapon1",{&mb_weapon1},{-1},-1,MAX_MOUSEB,