From d0c3260559bde19b488f7cfa1f9cf2e2ea9240ce Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 28 May 2018 10:26:43 +1000 Subject: [PATCH] Remove menu_updatecheck cvar and don't show the update message while connected to a server --- qcsrc/menu/xonotic/util.qc | 23 ++++++++++------------- xonotic-client.cfg | 1 - 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index c9cd001ba..fb4bb92a8 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -458,21 +458,18 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) void updateCheck() { - if(cvar("menu_updatecheck")) + if(!_Nex_ExtResponseSystem_Queried) { - if(!_Nex_ExtResponseSystem_Queried) - { - _Nex_ExtResponseSystem_Queried = 1; - float startcnt; - string uri; + _Nex_ExtResponseSystem_Queried = 1; + float startcnt; + string uri; - cvar_set("cl_startcount", ftos(startcnt = cvar("cl_startcount") + 1)); + cvar_set("cl_startcount", ftos(startcnt = cvar("cl_startcount") + 1)); - // for privacy, munge the start count a little - startcnt = floor((floor(startcnt / 10) + random()) * 10); - uri = sprintf("http://update.xonotic.org/checkupdate.txt?version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt); - uri_get(uri, URI_GET_UPDATENOTIFICATION); - } + // for privacy, munge the start count a little + startcnt = floor((floor(startcnt / 10) + random()) * 10); + uri = sprintf("http://update.xonotic.org/checkupdate.txt?version=%s&cnt=%d", uri_escape(cvar_string("g_xonoticversion")), startcnt); + uri_get(uri, URI_GET_UPDATENOTIFICATION); } if(_Nex_ExtResponseSystem_PacksStep > 0) @@ -565,7 +562,7 @@ void preMenuDraw() updateCheck(); - if(_Nex_ExtResponseSystem_UpdateTo != "") + if(_Nex_ExtResponseSystem_UpdateTo != "" && !(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) { // TODO rather turn this into a dialog fs = ((1/draw_scale.x) * eX + (1/draw_scale.y) * eY) * 12; diff --git a/xonotic-client.cfg b/xonotic-client.cfg index 2d7eb360d..164c40840 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -675,7 +675,6 @@ set cl_effects_lightningarc_drift_end 0.1 set cl_effects_lightningarc_branchfactor_start 0.25 set cl_effects_lightningarc_branchfactor_add 0.1 -set menu_updatecheck 1 "check for updates" set menu_updatecheck_getpacks 1 "get update packs from update server" set cl_loddistance1 1024 -- 2.39.2