From 5ee241897e1758c45d0bbf8a25a2d14175c07471 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Thu, 8 Feb 2024 20:43:05 +0100 Subject: [PATCH 1/2] rename Smooth to Animated Health/Armor Count Thanks @mikeday0 --- src/m_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index f79a97b7..14ac755d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3242,7 +3242,7 @@ setup_menu_t stat_settings1[] = // Status Bar and HUD Settings screen {"Backpack Shifts Ammo Color", S_YESNO, m_null, M_X, M_SPC, {"hud_backpack_thresholds"}}, {"Armor Color Matches Type", S_YESNO, m_null, M_X, M_SPC, {"hud_armor_type"}}, - {"Smooth Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"smooth_counts"}}, + {"Animated Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"smooth_counts"}}, MI_RESET, From b4960dd4d6302c7dcb64a4a9365c05ef977c97b7 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 9 Feb 2024 08:18:50 +0100 Subject: [PATCH 2/2] rename the config variable to hud_animated_counts Thanks @ceski-1 --- src/m_menu.c | 2 +- src/m_misc.c | 6 +++--- src/st_stuff.c | 4 ++-- src/st_stuff.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 14ac755d..16a726e2 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3242,7 +3242,7 @@ setup_menu_t stat_settings1[] = // Status Bar and HUD Settings screen {"Backpack Shifts Ammo Color", S_YESNO, m_null, M_X, M_SPC, {"hud_backpack_thresholds"}}, {"Armor Color Matches Type", S_YESNO, m_null, M_X, M_SPC, {"hud_armor_type"}}, - {"Animated Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"smooth_counts"}}, + {"Animated Health/Armor Count", S_YESNO, m_null, M_X, M_SPC, {"hud_animated_counts"}}, MI_RESET, diff --git a/src/m_misc.c b/src/m_misc.c index f8ba4d33..158a38b3 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -2609,10 +2609,10 @@ default_t defaults[] = { }, { // [Alaux] - "smooth_counts", - (config_t *) &smooth_counts, NULL, + "hud_animated_counts", + (config_t *) &hud_animated_counts, NULL, {0}, {0,1}, number, ss_stat, wad_yes, - "1 to enable smooth health/armor counts" + "1 to enable animated health/armor counts" }, { // below is red diff --git a/src/st_stuff.c b/src/st_stuff.c index 8b3863f9..2030c39c 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -243,7 +243,7 @@ static patch_t *arms[6][2]; static st_number_t w_ready; // [Alaux] -int smooth_counts; +int hud_animated_counts; int st_health = 100; int st_armor = 0; @@ -746,7 +746,7 @@ static int SmoothCount(int shownval, int realval) { int step = realval - shownval; - if (!smooth_counts || !step) + if (!hud_animated_counts || !step) { return realval; } diff --git a/src/st_stuff.h b/src/st_stuff.h index 30be4ff2..e8192929 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -60,7 +60,7 @@ void ST_InitRes(void); // killough 5/2/98: moved from m_misc.c: // [Alaux] -extern int smooth_counts; +extern int hud_animated_counts; extern int st_health; extern int st_armor;