edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show BB skins by default

Browse source
This commit is contained in:
def 2013-12-26 18:02:37 +01:00
parent 3eaad43b6b
commit 9c5031b34f
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/client/components/menus_settings.cpp
View file

@ -246,7 +246,8 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView)
void CMenus::RenderSettingsTee(CUIRect MainView)
{
CUIRect Button, Label;
CUIRect Button, Label, Button2;
static bool s_InitSkinlist = true;
MainView.HSplitTop(10.0f, 0, &MainView);
// skin info
@ -283,12 +284,17 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
// custom colour selector
MainView.HSplitTop(20.0f, 0, &MainView);
MainView.HSplitTop(20.0f, &Button, &MainView);
Button.VSplitLeft(230.0f, &Button, 0);
Button.VSplitMid(&Button, &Button2);
if(DoButton_CheckBox(&g_Config.m_PlayerColorBody, Localize("Custom colors"), g_Config.m_PlayerUseCustomColor, &Button))
{
g_Config.m_PlayerUseCustomColor = g_Config.m_PlayerUseCustomColor?0:1;
m_NeedSendinfo = true;
}
if(DoButton_CheckBox(&g_Config.m_ClShowSpecialSkins, Localize("Show Bandana Brothers skins"), g_Config.m_ClShowSpecialSkins, &Button2))
{
g_Config.m_ClShowSpecialSkins = g_Config.m_ClShowSpecialSkins?0:1;
s_InitSkinlist = true;
}
MainView.HSplitTop(5.0f, 0, &MainView);
MainView.HSplitTop(82.5f, &Label, &MainView);
@ -343,7 +349,6 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
// skin selector
MainView.HSplitTop(20.0f, 0, &MainView);
static bool s_InitSkinlist = true;
static sorted_array<const CSkins::CSkin *> s_paSkinList;
static float s_ScrollValue = 0.0f;
if(s_InitSkinlist)
@ -353,7 +358,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
{
const CSkins::CSkin *s = m_pClient->m_pSkins->Get(i);
// no special skins
if(s->m_aName[0] == 'x' && s->m_aName[1] == '_')
if((s->m_aName[0] == 'x' && s->m_aName[1] == '_') || (!g_Config.m_ClShowSpecialSkins && s->m_aName[0] == '0'))
continue;
s_paSkinList.add(s);
}

1
src/game/variables.h
View file

@ -42,6 +42,7 @@ MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SA
MACRO_CONFIG_STR(ClVersionServer, cl_version_server, 100, "version.teeworlds.com", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to check for new versions")
MACRO_CONFIG_STR(ClLanguagefile, cl_languagefile, 255, "", CFGFLAG_CLIENT|CFGFLAG_SAVE, "What language file to use")
MACRO_CONFIG_INT(ClShowSpecialSkins, cl_show_special_skins, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show special skins in UI")
MACRO_CONFIG_INT(PlayerUseCustomColor, player_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toggles usage of custom colors")
MACRO_CONFIG_INT(PlayerColorBody, player_color_body, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player body color")