Merge remote branch 'origin/terencehill/physics_panel_updates'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / util.qc

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 5c0a958d0f6b96396cf263bd0b70ddc9b64266f4..580f22a93c7c7e5caab333763150067fa5a0173f 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -31,7 +31,7 @@ string getZonedTooltipForIdentifier(string s)
                if(t != "")
                        return strzone(t);
        }
-       if(prvm_language == "en" || prvm_language == "")
+       if(prvm_language == "en")
        {
                t = cvar_description(s);
                if(t != "" && t != "custom cvar")
@@ -259,18 +259,23 @@ string _Nex_ExtResponseSystem_UpdateToURL;
 
 void URI_Get_Callback(float id, float status, string data)
 {
-       if (id == URI_GET_DISCARD)
+       if(url_URI_Get_Callback(id, status, data))
        {
-               // discard
+               // handled
        }
-       else if(id == URI_GET_UPDATENOTIFICATION)
+       else if (id == URI_GET_DISCARD)
        {
-               UpdateNotification_URI_Get_Callback(id, status, data);
+               // discard
        }
-       else if(id >= URI_GET_CURL && id <= URI_GET_CURL_END)
+       else if (id >= URI_GET_CURL && id <= URI_GET_CURL_END)
        {
+               // sv_cmd curl
                Curl_URI_Get_Callback(id, status, data);
        }
+       else if (id == URI_GET_UPDATENOTIFICATION)
+       {
+               UpdateNotification_URI_Get_Callback(id, status, data);
+       }
        else
        {
                print(sprintf(_("Received HTTP request data for an invalid id %d.\n"), id));
@@ -605,7 +610,7 @@ string GameType_GetIcon(float cnt)
        return "";
 }
 
-string GameType_GetTeams(float cnt)
+/*string GameType_GetTeams(float cnt) // poor implementation, later something else could be done that's better?
 {
        float i = GameType_GetID(cnt);
        string s = _MapInfo_GetDefaultEx(i);
@@ -619,7 +624,7 @@ string GameType_GetTeams(float cnt)
        }
        
        return _("tuba for all");
-}
+}*/
 
 void dialog_hudpanel_common_notoggle(entity me, string panelname)
 {