ToS: update check and ToS download from xonotic.org

diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qc b/qcsrc/menu/xonotic/dialog_termsofservice.qc
index 885330d930ad62528c0ddc5f2b86752f2b918ef5..66dde13eafc19a6b046a5024f77b897d09a360a3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_termsofservice.qc
+++ b/qcsrc/menu/xonotic/dialog_termsofservice.qc
@@ -25,8 +25,7 @@ void DontAccept_Clicked(entity btn, entity me)
 
 void XonoticToSDialog_loadXonoticToS(entity me)
 {
-       string downloadurl = "http://maria.omaera.org/tos.txt";
-       url_single_fopen(downloadurl, FILE_READ, XonoticToS_OnGet, me);
+       url_single_fopen(termsofservice_url, FILE_READ, XonoticToS_OnGet, me);
 }
 
 void XonoticToS_OnGet(entity fh, entity me, int status)

diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qh b/qcsrc/menu/xonotic/dialog_termsofservice.qh
index 1d45cdb2b1bfcfedf72ebbf2be9f91a61e59101f..cb1f279274c76988390fe3ae2eee178641fb7efe 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_termsofservice.qh
+++ b/qcsrc/menu/xonotic/dialog_termsofservice.qh
@@ -1,6 +1,7 @@
 #pragma once
 
 int autocvar__termsofservice_accepted;
+const string termsofservice_url = "http://update.xonotic.org/tos.txt";
 
 #include "rootdialog.qh"
 CLASS(XonoticToSDialog, XonoticRootDialog)

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 6e551f559d167fa13a96627972c674f41acc9562..06139566d85ad6a50c30af6d3f09d19a3eca418d 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -483,8 +483,7 @@ void updateCheck()
 
                // 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 = "http://maria.omaera.org/checkupdate.txt";
+               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);
        }