Make alt_arms menu item rebuild ST widgets

Additionally, some reformatting.
MrAlaux · Dec 1, 2023 · f4442cb · f4442cb
1 parent 5aee869
commit f4442cb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/m_menu.c b/src/m_menu.c
@@ -3712,7 +3712,7 @@ setup_menu_t stat_settings4[] =
   {"Nugget - Extended HUD", S_SKIP|S_TITLE, m_null, M_X, M_Y + stat4_title1 * M_SPC},
 
     {"Show Powerup Timers",      S_YESNO|S_COSMETIC, m_null, M_X, M_Y + stat4_powers   * M_SPC, {"hud_power_timers"}},
-    {"Alternative Arms Display", S_YESNO,            m_null, M_X, M_Y + stat4_altarms  * M_SPC, {"alt_arms"}},
+    {"Alternative Arms Display", S_YESNO,            m_null, M_X, M_Y + stat4_altarms  * M_SPC, {"alt_arms"}, 0, ST_createWidgets},
     {"Smart Totals",             S_YESNO,            m_null, M_X, M_Y + stat4_smart    * M_SPC, {"smarttotals"}},
     {"Show Kills Percentage",    S_YESNO,            m_null, M_X, M_Y + stat4_killspct * M_SPC, {"hud_kills_percentage"}},
 

diff --git a/src/p_user.c b/src/p_user.c
@@ -219,9 +219,7 @@ void P_MovePlayer (player_t* player)
 {
   ticcmd_t *cmd = &player->cmd;
   mobj_t *mo = player->mo;
-  // [Nugget]
-  static boolean crouchKeyDown = false;
-  int cforwardmove, csidemove;
+  static boolean crouchKeyDown = false; // [Nugget]
 
   mo->angle += cmd->angleturn << 16;
   onground = mo->z <= mo->floorz;
@@ -376,23 +374,26 @@ void P_MovePlayer (player_t* player)
           int bobfactor =
             friction < ORIG_FRICTION ? movefactor : ORIG_FRICTION_FACTOR;
 
-          // [Nugget]
-          cforwardmove = cmd->forwardmove;
-          csidemove = cmd->sidemove;
-          // Check for crouching
+          // [Nugget] /-------------------------------------------------------
+
+          char forwardmove = cmd->forwardmove,
+               sidemove    = cmd->sidemove;
+
           if (player->mo->intflags & MIF_CROUCHING)
-          { cforwardmove /= 2; csidemove /= 2; }
+          { forwardmove /= 2;  sidemove /= 2; }
+
+          // [Nugget] -------------------------------------------------------/
 
           if (cmd->forwardmove)
             {
-              P_Bob(player,mo->angle,cforwardmove*bobfactor);
-              P_Thrust(player,mo->angle,cforwardmove*movefactor);
+              P_Bob(player,mo->angle,forwardmove*bobfactor);
+              P_Thrust(player,mo->angle,forwardmove*movefactor);
             }
 
           if (cmd->sidemove)
             {
-              P_Bob(player,mo->angle-ANG90,csidemove*bobfactor);
-              P_Thrust(player,mo->angle-ANG90,csidemove*movefactor);
+              P_Bob(player,mo->angle-ANG90,sidemove*bobfactor);
+              P_Thrust(player,mo->angle-ANG90,sidemove*movefactor);
             }
         }
       // [Nugget] Allow minimal mid-air movement if Jumping is enabled

diff --git a/src/st_stuff.c b/src/st_stuff.c
@@ -129,8 +129,6 @@ int st_crispyhud; // [Nugget] Now an int
 static boolean st_classicstatusbar;
 static boolean st_statusbarface; // [Nugget] Face may still be drawn in NUGHUD
 
-void ST_createWidgets(); // [Nugget] Prototype this
-
 // !deathmatch
 static boolean st_notdeathmatch;
 

diff --git a/src/st_stuff.h b/src/st_stuff.h
@@ -139,6 +139,8 @@ void ST_Warnings(void);
 // [crispy] forcefully initialize the status bar backing screen
 extern void ST_refreshBackground(boolean force);
 
+extern void ST_createWidgets(void); // [Nugget]
+
 // killough 5/2/98: moved from m_misc.c:
 
 // [Alaux]