From 95f7313add21253d44d441e1a5fafbf3a81cd930 Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Tue, 20 Feb 2024 16:11:51 +0700 Subject: [PATCH] rename S_THRM_PCT->S_PCT, show `%` sign for S_NUM items --- src/m_menu.c | 11 +++++++---- src/m_menu.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 033e25c0..a9af704a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2301,8 +2301,11 @@ static void M_DrawSetting(setup_menu_t *s, int accum_y) gather_buffer[gather_count] = 0; strcpy(menu_buffer, gather_buffer); } + else if (flags & S_PCT) + M_snprintf(menu_buffer, sizeof(menu_buffer), "%d%%", s->var.def->location->i); else - sprintf(menu_buffer,"%d",s->var.def->location->i); + M_snprintf(menu_buffer, sizeof(menu_buffer), "%d", s->var.def->location->i); + BlinkingArrowRight(s); M_DrawMenuStringEx(flags, x, y, color); return; @@ -2442,7 +2445,7 @@ static void M_DrawSetting(setup_menu_t *s, int accum_y) if (strings) strcpy(menu_buffer, strings[value]); - else if (flags & S_THRM_PCT) + else if (flags & S_PCT) M_snprintf(menu_buffer, sizeof(menu_buffer), "%d%%", value); else M_snprintf(menu_buffer, sizeof(menu_buffer), "%d", value); @@ -4138,7 +4141,7 @@ setup_menu_t gen_settings5[] = { {"Sprite Translucency", S_YESNO|S_STRICT, m_null, M_X, M_SPC, {"translucency"}}, - {"Translucency", S_THERMO|S_ACTION|S_THRM_PCT, m_null, M_X_THRM8, M_SPC, + {"Translucency", S_THERMO|S_ACTION|S_PCT, m_null, M_X_THRM8, M_SPC, {"tran_filter_pct"}, 0, M_Trans}, {"", S_SKIP, m_null, M_X, M_THRM_SPC}, @@ -4193,7 +4196,7 @@ setup_menu_t gen_settings6[] = { {"Miscellaneous", S_SKIP|S_TITLE, m_null, M_X, M_SPC}, - {"Game speed", S_NUM|S_STRICT, m_null, M_X, M_SPC, + {"Game speed", S_NUM|S_STRICT|S_PCT, m_null, M_X, M_SPC, {"realtic_clock_rate"}, 0, M_ResetTimeScale}, {"Default Skill", S_CHOICE|S_LEVWARN, m_null, M_X, M_SPC, diff --git a/src/m_menu.h b/src/m_menu.h index 32d5c962..985fbefb 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -109,7 +109,7 @@ void M_DisableVoxelsRenderingItem(void); #define S_ONOFF 0x08000000 // Alias for S_YESNO #define S_MBF 0x10000000 // Disable if complevel < mbf #define S_THRM_SIZE4 0x20000000 // Thermo bar size 4 -#define S_THRM_PCT 0x40000000 // Show % sign +#define S_PCT 0x40000000 // Show % sign // S_SHOWDESC = the set of items whose description should be displayed // S_SHOWSET = the set of items whose setting should be displayed