From cfc3b66707d382fe4f4135703d10d9b430d1b242 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 27 Dec 2023 11:27:58 -0800 Subject: [PATCH] M_DrawGenericOptions: highlight non-default cvar value in orange and display dot beside --- src/k_menu.h | 2 +- src/k_menudraw.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/k_menu.h b/src/k_menu.h index 9260acb92..12af335f5 100644 --- a/src/k_menu.h +++ b/src/k_menu.h @@ -1179,7 +1179,7 @@ void M_HandleImageDef(INT32 choice); // flags for text highlights #define highlightflags V_AQUAMAP #define recommendedflags V_GREENMAP -#define warningflags V_GRAYMAP +#define warningflags V_ORANGEMAP // For some menu highlights UINT16 M_GetCvPlayerColor(UINT8 pnum); diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 290d367d8..323d68dd8 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -4190,10 +4190,11 @@ void M_DrawGenericOptions(void) y += 16; } break; - default: + default: { + boolean isDefault = CV_IsSetToDefault(cv); w = V_StringWidth(cv->string, 0); V_DrawString(BASEVIDWIDTH - x - w, y, - ((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags), cv->string); + (!isDefault ? warningflags : highlightflags), cv->string); if (i == itemOn) { V_DrawCharacter(BASEVIDWIDTH - x - 10 - w - (skullAnimCounter/5), y, @@ -4201,7 +4202,12 @@ void M_DrawGenericOptions(void) V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y, '\x1D' | highlightflags, false); // right arrow } + if (!isDefault) + { + V_DrawCharacter(BASEVIDWIDTH - x + (i == itemOn ? 13 : 5), y - 2, '.' | warningflags, false); + } break; + } } break; }