From 10d6852bd92efcf1ea20196bd03f7988f80a2a4e Mon Sep 17 00:00:00 2001 From: NeonKnightOA Date: Sat, 6 Apr 2024 09:06:57 -0300 Subject: [PATCH] Fix #328 and also fix a similar problem with `cg_weaponBarStyle`. (#335) --- CHANGELOG.md | 1 + code/q3_ui/ui_hud.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a9ec49..3761251 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -190,6 +190,7 @@ **Release date:** April 7, 2024 +* Fixed: The values of `cg_obituaryOutput` and `cg_weaponBarStyle` weren't properly loaded in Classic UI's HUD menu. * Fixed: Team Deathmatch wasn't accounted as a team-based gametype. * New cvar: `g_autoGameLimits`, if set, uses the frag, time and capturelimits set in the .info or .arena files (including `arenas.txt`) rather than user-set values. It's enabled by default for SP. This also allows the usage of `capturelimit` in .arena files. * New special matches for Classic SP in addition to `"training"` and `"final"`. These can be specified in either the map's specific .info file (the game will look at this first) the map's .arena file or arenas.txt: diff --git a/code/q3_ui/ui_hud.c b/code/q3_ui/ui_hud.c index f39e900..d732853 100644 --- a/code/q3_ui/ui_hud.c +++ b/code/q3_ui/ui_hud.c @@ -146,10 +146,10 @@ static void HUDOptions_SetMenuItems( void ) { hudOptions_s.crosshairColorBlue.curvalue = trap_Cvar_VariableValue( "cg_crosshairColorBlue")*255.0f; hudOptions_s.draw3DIcons.curvalue = trap_Cvar_VariableValue( "cg_draw3DIcons") != 0; hudOptions_s.alwaysWeaponBar.curvalue = trap_Cvar_VariableValue( "cg_alwaysWeaponBar" ) != 0; - hudOptions_s.weaponBarStyle.curvalue = trap_Cvar_VariableValue( "cg_weaponBarStyle" ) != 0; + hudOptions_s.weaponBarStyle.curvalue = Com_Clamp( 0, 7, trap_Cvar_VariableValue( "cg_weaponBarStyle" ) ); hudOptions_s.identifyTarget.curvalue = trap_Cvar_VariableValue( "cg_drawCrosshairNames" ) != 0; hudOptions_s.drawTeamOverlay.curvalue = Com_Clamp( 0, 3, trap_Cvar_VariableValue( "cg_drawTeamOverlay" ) ); - hudOptions_s.obituaryOutput.curvalue = trap_Cvar_VariableValue( "cg_obituaryOutput" ) != 0; + hudOptions_s.obituaryOutput.curvalue = Com_Clamp( 0, 4, trap_Cvar_VariableValue( "cg_obituaryOutput" ) ); hudOptions_s.drawFPS.curvalue = trap_Cvar_VariableValue( "cg_drawfps") != 0; hudOptions_s.drawTimer.curvalue = trap_Cvar_VariableValue( "cg_drawTimer") != 0; hudOptions_s.drawStatus.curvalue = trap_Cvar_VariableValue( "cg_drawStatus") != 0;