From 0964ba5c7b521b17c94409268788deb1f6d76c77 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 23 Apr 2023 23:39:28 +0100 Subject: [PATCH] COM_Help_f: Adjust Color_cons_t (and catch Followercolor_cons_t) per review --- src/command.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/command.c b/src/command.c index 3d6ec3529..85d2573f3 100644 --- a/src/command.c +++ b/src/command.c @@ -910,17 +910,28 @@ static void COM_Help_f(void) CONS_Printf(" Yes or No (On or Off, 1 or 0)\n"); else if (cvar->PossibleValue == CV_OnOff) CONS_Printf(" On or Off (Yes or No, 1 or 0)\n"); - else if (cvar->PossibleValue == Color_cons_t) + else if (cvar->PossibleValue == Color_cons_t || cvar->PossibleValue == Followercolor_cons_t) { + boolean follower = (cvar->PossibleValue == Followercolor_cons_t); for (i = SKINCOLOR_NONE; i < numskincolors; ++i) { - if (K_ColorUsable(i, false) == true) + if (K_ColorUsable(i, follower) == true) { - CONS_Printf(" %-2d : %s\n", i, skincolors[i].name); + CONS_Printf(" %-3d : %s\n", i, skincolors[i].name); if (i == cvar->value) cvalue = skincolors[i].name; } } + + if (follower) + { + CONS_Printf(" %-3d : %s\n", FOLLOWERCOLOR_MATCH, "Match"); + if (FOLLOWERCOLOR_MATCH == cvar->value) + cvalue = "Match"; + CONS_Printf(" %-3d : %s\n", FOLLOWERCOLOR_MATCH, "Opposite"); + if (FOLLOWERCOLOR_OPPOSITE == cvar->value) + cvalue = "Opposite"; + } } else {