Filter vanilla only skins at loading already

chillerbot · Aug 20, 2022 · 6e5c5cb · 6e5c5cb
1 parent d1b8d53
commit 6e5c5cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
@@ -668,10 +668,6 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 			if((pSkinToBeSelected->m_aName[0] == 'x' && pSkinToBeSelected->m_aName[1] == '_'))
 				continue;
 
-			// vanilla skins only
-			if(g_Config.m_ClVanillaSkinsOnly && !pSkinToBeSelected->m_IsVanilla)
-				continue;
-
 			if(pSkinToBeSelected == 0)
 				continue;
 

diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp
@@ -65,6 +65,9 @@ int CSkins::SkinScan(const char *pName, int IsDir, int DirType, void *pUser)
 	str_copy(aNameWithoutPng, pName);
 	aNameWithoutPng[str_length(aNameWithoutPng) - 4] = 0;
 
+	if(g_Config.m_ClVanillaSkinsOnly && !IsVanillaSkin(aNameWithoutPng))
+		return 0;
+
 	// Don't add duplicate skins (one from user's config directory, other from
 	// client itself)
 	for(int i = 0; i < pSelf->Num(); i++)
@@ -154,7 +157,6 @@ int CSkins::LoadSkin(const char *pName, CImageInfo &Info)
 	}
 
 	CSkin Skin;
-	Skin.m_IsVanilla = IsVanillaSkin(pName);
 	Skin.m_OriginalSkin.m_Body = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY]);
 	Skin.m_OriginalSkin.m_BodyOutline = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_BODY_OUTLINE]);
 	Skin.m_OriginalSkin.m_Feet = Graphics()->LoadSpriteTexture(Info, &g_pData->m_aSprites[SPRITE_TEE_FOOT]);
@@ -355,7 +357,6 @@ void CSkins::Refresh(TSkinLoadedCBFunc &&SkinLoadedFunc)
 	{
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "gameclient", "failed to load skins. folder='skins/'");
 		CSkin DummySkin;
-		DummySkin.m_IsVanilla = true;
 		str_copy(DummySkin.m_aName, "dummy");
 		DummySkin.m_BloodColor = ColorRGBA(1.0f, 1.0f, 1.0f);
 		m_vSkins.push_back(DummySkin);

diff --git a/src/game/client/skin.h b/src/game/client/skin.h
@@ -8,8 +8,6 @@
 // do this better and nicer
 struct CSkin
 {
-	bool m_IsVanilla;
-
 	struct SSkinTextures
 	{
 		IGraphics::CTextureHandle m_Body;