Also force carousel on freecam

MrAlaux · Dec 14, 2024 · c7000be · c7000be
1 parent e3e4bba
commit c7000be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/mn_setup.c b/src/mn_setup.c
@@ -1921,7 +1921,7 @@ static const char *bobbing_style_strings[] = {
 };
 
 static const char *force_carousel_strings[] = {
-  "Off", "On Chasecam", "Always"
+  "Off", "Off Player", "Always"
 };
 
 static void NuggetResetWeaponInertia(void)

diff --git a/src/st_carousel.c b/src/st_carousel.c
@@ -132,7 +132,8 @@ static void BuildWeaponIcons(const player_t *player)
 boolean ST_ForceCarousel(const player_t *const player)
 {
   return player->pendingweapon != wp_nochange
-         && (force_carousel == 2 || (force_carousel == 1 && R_GetChasecamOn()));
+         && (force_carousel == 2
+             || (force_carousel == 1 && (R_GetChasecamOn() || R_GetFreecamOn())));
 }
 
 void ST_UpdateCarousel(player_t *player)

diff --git a/src/st_stuff.c b/src/st_stuff.c
@@ -3772,7 +3772,7 @@ void ST_BindSTSVariables(void)
 
   // [Nugget]
   M_BindNum("force_carousel", &force_carousel, NULL,
-            1, 0, 2, ss_weap, wad_no, "Force display of weapon carousel (1 = On chasecam; 2 = Always)");
+            1, 0, 2, ss_weap, wad_no, "Force display of weapon carousel (1 = Off player; 2 = Always)");
 }
 
 //----------------------------------------------------------------------------