Only show missing icons if we want to see them

Toggling ui_showAllSkins causes the game to hitch for a moment but it's better than making it a CVAR_LATCH.
eternalcodes · Apr 11, 2019 · d539687 · d539687
1 parent c4b2846
commit d539687
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/codemp/ui/ui_local.h b/codemp/ui/ui_local.h
@@ -49,6 +49,7 @@ void UI_Load( void );
 void UI_LoadMenus( const char *menuFile, qboolean reset );
 void UI_LoadArenas( void );
 void UI_LoadForceConfig_List( void );
+void UI_BuildQ3Model_List( void );
 
 //
 // ui_players.c

diff --git a/codemp/ui/ui_main.c b/codemp/ui/ui_main.c
@@ -11014,6 +11014,9 @@ static qboolean bIsSkinFile(const char* dirptr, const char* skinname)
 	char fpath[MAX_QPATH];
 	int f;
 
+	if (!ui_showAllSkins.integer)
+		return qfalse;
+
 	//don't list non-humanoid skins... - these aren't caught by the other checks below
 	if (!Q_stricmpn(dirptr, "default", 7))
 		return qfalse;
@@ -11053,7 +11056,7 @@ static qboolean bIsSkinFile(const char* dirptr, const char* skinname)
 PlayerModel_BuildList
 =================
 */
-static void UI_BuildQ3Model_List( void )
+void UI_BuildQ3Model_List( void )
 {
 	int		numdirs;
 	int		numfiles;

diff --git a/codemp/ui/ui_xcvar.h b/codemp/ui/ui_xcvar.h
@@ -161,6 +161,6 @@ XCVAR_DEF( cg_strafeHelper,					"3008",					NULL,				CVAR_ARCHIVE_ND )
 XCVAR_DEF( cg_stylePlayer,					"0",					NULL,				CVAR_ARCHIVE )
 XCVAR_DEF( cg_speedometer,					"0",					NULL,				CVAR_ARCHIVE )
 XCVAR_DEF( ui_headCount,					"-1",					NULL,				CVAR_ARCHIVE|CVAR_INTERNAL|CVAR_ROM )
-XCVAR_DEF( ui_showAllSkins,					"0",					NULL,				CVAR_ARCHIVE_ND )
+XCVAR_DEF( ui_showAllSkins,					"0",	UI_BuildQ3Model_List,				CVAR_ARCHIVE_ND )
 
 #undef XCVAR_DEF