add Crispy HUD

src/mn_internal.h

@@ -45,6 +45,8 @@ typedef enum
     key_mode
 } menu_input_mode_t;
 
+extern int maxscreenblocks;
+
 extern int bigfont_priority;
 
 extern menu_input_mode_t help_input, old_help_input; // pad_mode or key_mode.

src/mn_menu.c

@@ -76,7 +76,7 @@
 
 // Blocky mode, has default, 0 = high, 1 = normal
 // int     detailLevel;    obsolete -- killough
-int screenblocks; // has default
+int screenblocks, maxscreenblocks; // has default
 
 static int quickSaveSlot; // -1 = no quicksave slot picked!
 
@@ -147,7 +147,7 @@
     CHOICE_VALUE = 0,
 } mchoice_t;
 
 typedef struct
 {
     short status; // 0 = no cursor here, 1 = ok, 2 = arrows ok
     char name[10];
@@ -1798,7 +1798,7 @@
         default:
             break;
     }
-    screenblocks = BETWEEN(3, 12, screenblocks);
+    screenblocks = BETWEEN(3, maxscreenblocks, screenblocks);
     R_SetViewSize(screenblocks /*, detailLevel obsolete -- killough */);
 }
 
@@ -2549,7 +2549,7 @@
         else
         {
             ++screenblocks;
-            if (screenblocks > 12)
+            if (screenblocks > maxscreenblocks)
             {
                 screenblocks = 10;
             }

src/mn_setup.c

@@ -1816,12 +1816,6 @@ static void RefreshSolidBackground(void)
     st_refresh_background = true;
 }
 
-static const char *screensize_strings[] = {
-    "",           "",           "",           "Status Bar", "Status Bar",
-    "Status Bar", "Status Bar", "Status Bar", "Status Bar", "Status Bar",
-    "Status Bar", "Fullscreen", "Fullscreen"
-};
-
 static const char *st_layout_strings[] = {
     "Original", "Wide"
 };
@@ -4784,7 +4778,7 @@ static const char **selectstrings[] = {
     percent_strings,
     curve_strings,
     center_weapon_strings,
-    screensize_strings,
+    NULL, // str_screensize
     st_layout_strings,
     show_widgets_strings,
     show_adv_widgets_strings,
@@ -4842,6 +4836,29 @@ static const char **GetMidiPlayerStrings(void)
     return I_DeviceList();
 }
 
+static const char **GetScreenSizeStrings(void)
+{
+    const char **strings = NULL;
+
+    for (int i = 0; i < 3; ++i)
+    {
+        array_push(strings, "");
+    }
+    for (int i = 3; i < 10; ++i)
+    {
+        array_push(strings, "Status Bar");
+    }
+
+    const char **st_strings = ST_StatusbarList();
+    for (int i = 0; i < array_size(st_strings); ++i)
+    {
+        array_push(strings, st_strings[i]);
+    }
+
+    maxscreenblocks = array_size(strings) - 1;
+    return strings;
+}
+
 void MN_InitMenuStrings(void)
 {
     UpdateWeaponSlotLabels();
@@ -4854,6 +4871,7 @@ void MN_InitMenuStrings(void)
     selectstrings[str_gyro_sens] = GetGyroSensitivityStrings();
     selectstrings[str_gyro_accel] = GetGyroAccelStrings();
     selectstrings[str_resampler] = GetResamplerStrings();
+    selectstrings[str_screensize] = GetScreenSizeStrings();
 }
 
 void MN_SetupResetMenu(void)

src/r_main.c

@@ -1031,7 +1031,7 @@ void R_BindRenderVariables(void)
   BIND_NUM_GENERAL(invul_mode, INVUL_MBF, INVUL_VANILLA, INVUL_GRAY,
     "Invulnerability effect (0 = Vanilla; 1 = MBF; 2 = Gray)");
   BIND_BOOL(flashing_hom, true, "Enable flashing of the HOM indicator");
-  BIND_NUM(screenblocks, 10, 3, 12, "Size of game-world screen");
+  BIND_NUM(screenblocks, 10, 3, UL, "Size of game-world screen");
 
   M_BindBool("translucency", &translucency, NULL, true, ss_gen, wad_yes,
              "Translucency for some things");

src/st_stuff.c

@@ -1020,6 +1020,11 @@ static void UpdateStatusBar(player_t *player)
 
     int barindex = MAX(screenblocks - 10, 0);
 
+    if (barindex >= array_size(sbardef->statusbars))
+    {
+        barindex = array_size(sbardef->statusbars) - 1;
+    }
+
     if (automapactive && automapoverlay == AM_OVERLAY_OFF)
     {
         barindex = 0;
@@ -1833,6 +1838,35 @@ void ST_InitRes(void)
                  PU_RENDERER, 0);
 }
 
+const char **ST_StatusbarList(void)
+{
+    if (!sbardef)
+    {
+        return NULL;
+    }
+
+    static const char **strings;
+
+    if (array_size(strings))
+    {
+        return strings;
+    }
+
+    statusbar_t *item;
+    array_foreach(item, sbardef->statusbars)
+    {
+        if (item->fullscreenrender)
+        {
+            array_push(strings, "Fullscreen");
+        }
+        else
+        {
+            array_push(strings, "Status Bar");
+        }
+    }
+    return strings;
+}
+
 void ST_ResetPalette(void)
 {
     I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE));

src/st_stuff.h

@@ -74,6 +74,8 @@ extern struct patch_s **hu_font;
 void WI_UpdateWidgets(void);
 void WI_DrawWidgets(void);
 
+const char **ST_StatusbarList(void);
+
 void ST_BindSTSVariables(void);
 
 #endif