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

Disable autoupdate on Mac

Browse source
This commit is contained in:
def 2014-04-28 00:23:04 +02:00
parent 5f60491002
commit 215e5dbcab
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/engine/shared/config_variables.h
View file

@ -245,7 +245,6 @@ MACRO_CONFIG_INT(ClShowNinja, cl_show_ninja, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAV
MACRO_CONFIG_INT(ClShowOtherHookColl, cl_show_other_hook_coll, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show other players' hook collision line") MACRO_CONFIG_INT(ClShowOtherHookColl, cl_show_other_hook_coll, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show other players' hook collision line")
MACRO_CONFIG_INT(ClChatTeamColors, cl_chat_teamcolors, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show names in chat in team colors") MACRO_CONFIG_INT(ClChatTeamColors, cl_chat_teamcolors, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Show names in chat in team colors")
MACRO_CONFIG_INT(ClShowDirection, cl_show_direction, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show tee direction") MACRO_CONFIG_INT(ClShowDirection, cl_show_direction, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Show tee direction")
MACRO_CONFIG_INT(ClAutoUpdate, cl_auto_update, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Auto-Update")
MACRO_CONFIG_INT(hcAutoUpdate, hc_auto_update, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Auto-Update")
#endif #endif

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

@ -1290,7 +1290,7 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView)
MainView.HSplitTop(30.0f, &Label, &Miscellaneous); MainView.HSplitTop(30.0f, &Label, &Miscellaneous);
UI()->DoLabelScaled(&Label, Localize("Miscellaneous"), 20.0f, -1); UI()->DoLabelScaled(&Label, Localize("Miscellaneous"), 20.0f, -1);
Miscellaneous.Margin(5.0f, &Miscellaneous); Miscellaneous.VMargin(5.0f, &Miscellaneous);
Miscellaneous.VSplitMid(&Left, &Right); Miscellaneous.VSplitMid(&Left, &Right);
Left.VSplitRight(5.0f, &Left, 0); Left.VSplitRight(5.0f, &Left, 0);
Right.VMargin(5.0f, &Right); Right.VMargin(5.0f, &Right);
@ -1308,11 +1308,12 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView)
} }
// Auto Update // Auto Update
#if !defined(CONF_PLATFORM_MACOSX)
CUIRect HUDItem; CUIRect HUDItem;
Left.HSplitTop(20.0f, &HUDItem, &Left); Left.HSplitTop(20.0f, &HUDItem, &Left);
HUDItem.VSplitMid(&HUDItem, &Button); HUDItem.VSplitMid(&HUDItem, &Button);
if(DoButton_CheckBox(&g_Config.m_hcAutoUpdate, Localize("Auto-Update"), g_Config.m_hcAutoUpdate, &HUDItem)) if(DoButton_CheckBox(&g_Config.m_ClAutoUpdate, Localize("Auto-Update"), g_Config.m_ClAutoUpdate, &HUDItem))
g_Config.m_hcAutoUpdate ^= 1; g_Config.m_ClAutoUpdate ^= 1;
Button.Margin(2.0f, &Button); Button.Margin(2.0f, &Button);
static int s_ButtonAutoUpdate = 0; static int s_ButtonAutoUpdate = 0;
if (DoButton_Menu((void*)&s_ButtonAutoUpdate, Localize("Check now"), 0, &Button)) if (DoButton_Menu((void*)&s_ButtonAutoUpdate, Localize("Check now"), 0, &Button))
@ -1339,4 +1340,5 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView)
RenderUpdating(aBuf); RenderUpdating(aBuf);
} }
} }
#endif
} }

4
src/game/client/gameclient.cpp
View file

@ -274,8 +274,9 @@ void CGameClient::OnInit()
m_All.m_paComponents[i]->OnInit(); m_All.m_paComponents[i]->OnInit();
// auto update // auto update
#if !defined(CONF_PLATFORM_MACOSX)
char aBuf[256]; char aBuf[256];
if (g_Config.m_hcAutoUpdate) if (g_Config.m_ClAutoUpdate)
{ {
str_format(aBuf, sizeof(aBuf), "Checking for updates"); str_format(aBuf, sizeof(aBuf), "Checking for updates");
g_GameClient.m_pMenus->RenderUpdating(aBuf); g_GameClient.m_pMenus->RenderUpdating(aBuf);
@ -299,6 +300,7 @@ void CGameClient::OnInit()
g_GameClient.m_pMenus->RenderUpdating(aBuf); g_GameClient.m_pMenus->RenderUpdating(aBuf);
} }
} }
#endif
// setup load amount// load textures // setup load amount// load textures
for(int i = 0; i < g_pData->m_NumImages; i++) for(int i = 0; i < g_pData->m_NumImages; i++)