Merge branch 'master' into terencehill/menu_tooltips_2

[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 1d21ba4910a7a391b8d3a87b40bc27f988fe5353..3207132a4559a73c28f45898cdbb7b93f6898d80 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -22,7 +22,7 @@ void unloadTooltips()
 string getZonedTooltipForIdentifier(string s)
 {
        string t;
-       if(s == "")
+       if(s == "" || tooltipdb < 0)
                return string_null;
        if(tooltipdb >= 0)
        {
@@ -72,6 +72,12 @@ void loadAllCvars(entity root)
 
 .string cvarNames_Multi;
 .void(entity me) saveCvars_Multi;
+string getCvarsMulti(entity me)
+{
+       if (me.cvarNames_Multi)
+               return me.cvarNames_Multi;
+       return string_null;
+}
 void saveCvarsMulti(entity me)
 {
        float n, i;