#includes: cleanup menu

[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 d2bf9c92023e67891226a2eef6d8a2ee4f8f1a32..157a9199cbe2dcfed876764332dbdb699020ceb4 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -1,6 +1,8 @@
 #include "util.qh"
+
+#include "../item.qc"
+
 #include "../menu.qh"
-#include "../oo/base.qh"
 #include "../../common/campaign_common.qh"
 #include "../../common/constants.qh"
 #include "../../common/mapinfo.qh"
@@ -17,39 +19,6 @@ float GL_Have_TextureCompression()
        return (GL_CheckExtension("GL_EXT_texture_compression_s3tc") && GL_CheckExtension("GL_ARB_texture_compression"));
 }
 
-void loadTooltips()
-{
-       tooltipdb = db_load(language_filename("tooltips.db"));
-}
-void unloadTooltips()
-{
-       if(tooltipdb >= 0)
-               db_close(tooltipdb);
-       tooltipdb = -1;
-}
-string getZonedTooltipForIdentifier(string s)
-{
-       string t;
-       if(s == "")
-               return string_null;
-       if(tooltipdb >= 0)
-       {
-               t = db_get(tooltipdb, s);
-               if(t == "-")
-                       return string_null;
-               if(t != "")
-                       return strzone(t);
-       }
-       if(prvm_language == "en")
-       {
-               t = cvar_description(s);
-               if(t != "" && t != "custom cvar")
-                       return strzone(t);
-       }
-       LOG_TRACE("WARNING: no tooltip set for ", s, "\n");
-       return string_null;
-}
-
 .entity parent, firstChild, nextSibling;
 void forAllDescendants(entity root, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass)
 {
@@ -274,6 +243,32 @@ void setDependentWeird(entity e, float(entity) func)
        setDependent_Check(e);
 }
 
+void setZonedTooltip(entity e, string theTooltip, string theCvar)
+{
+       if(theTooltip == "") // no tooltip, use cvar description then
+       {
+               if(theCvar != "" && prvm_language == "en")
+               {
+                       string t = cvar_description(theCvar);
+                       if(t != "" && t != "custom cvar")
+                               theTooltip = t;
+               }
+       }
+       else if(theTooltip == "-") // no cvar description as tooltip
+       {
+               theTooltip = string_null;
+       }
+
+       if(e.tooltip)
+               strunzone(e.tooltip);
+       e.tooltip = (theTooltip != "") ? strzone(theTooltip) : string_null;
+}
+
+void clearTooltip(entity e)
+{
+       setZonedTooltip(e, string_null, string_null);
+}
+
 // URI SYSTEM ////////////////////////////////////////////////////////
 
 float _Nex_ExtResponseSystem_Queried;
@@ -678,8 +673,8 @@ float updateCompression()
        GAMETYPE(MAPINFO_TYPE_ASSAULT) \
        if (cvar("developer")) GAMETYPE(MAPINFO_TYPE_RACE) \
        GAMETYPE(MAPINFO_TYPE_CTS) \
-       //GAMETYPE(MAPINFO_TYPE_INVASION) \
-       /* nothing */
+       /* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
+       /**/
 
 int GameType_GetID(int cnt)
 {