diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 6e0998605..8f02b5181 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -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(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(hcAutoUpdate, hc_auto_update, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Auto-Update") +MACRO_CONFIG_INT(ClAutoUpdate, cl_auto_update, 1, 0, 1, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Auto-Update") #endif diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index eeaee686c..b9defb6b4 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -1290,7 +1290,7 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView) MainView.HSplitTop(30.0f, &Label, &Miscellaneous); UI()->DoLabelScaled(&Label, Localize("Miscellaneous"), 20.0f, -1); - Miscellaneous.Margin(5.0f, &Miscellaneous); + Miscellaneous.VMargin(5.0f, &Miscellaneous); Miscellaneous.VSplitMid(&Left, &Right); Left.VSplitRight(5.0f, &Left, 0); Right.VMargin(5.0f, &Right); @@ -1308,11 +1308,12 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView) } // Auto Update +#if !defined(CONF_PLATFORM_MACOSX) CUIRect HUDItem; Left.HSplitTop(20.0f, &HUDItem, &Left); HUDItem.VSplitMid(&HUDItem, &Button); - if(DoButton_CheckBox(&g_Config.m_hcAutoUpdate, Localize("Auto-Update"), g_Config.m_hcAutoUpdate, &HUDItem)) - g_Config.m_hcAutoUpdate ^= 1; + if(DoButton_CheckBox(&g_Config.m_ClAutoUpdate, Localize("Auto-Update"), g_Config.m_ClAutoUpdate, &HUDItem)) + g_Config.m_ClAutoUpdate ^= 1; Button.Margin(2.0f, &Button); static int s_ButtonAutoUpdate = 0; if (DoButton_Menu((void*)&s_ButtonAutoUpdate, Localize("Check now"), 0, &Button)) @@ -1339,4 +1340,5 @@ void CMenus::RenderSettingsDDRace(CUIRect MainView) RenderUpdating(aBuf); } } +#endif } diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 09acadbae..345f51d14 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -274,8 +274,9 @@ void CGameClient::OnInit() m_All.m_paComponents[i]->OnInit(); // auto update +#if !defined(CONF_PLATFORM_MACOSX) char aBuf[256]; - if (g_Config.m_hcAutoUpdate) + if (g_Config.m_ClAutoUpdate) { str_format(aBuf, sizeof(aBuf), "Checking for updates"); g_GameClient.m_pMenus->RenderUpdating(aBuf); @@ -299,6 +300,7 @@ void CGameClient::OnInit() g_GameClient.m_pMenus->RenderUpdating(aBuf); } } +#endif // setup load amount// load textures for(int i = 0; i < g_pData->m_NumImages; i++)