From: terencehill Date: Wed, 9 Mar 2011 22:07:48 +0000 (+0100) Subject: Dupe declaration of tooltipdb should have been removed from util.qc, not from util.qh X-Git-Tag: xonotic-v0.6.0~40^2~108^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94f8eaddf36f6f083696021012336a8d94287acc;p=xonotic%2Fxonotic-data.pk3dir.git Dupe declaration of tooltipdb should have been removed from util.qc, not from util.qh --- diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index a24ffac62..148642921 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -8,7 +8,6 @@ float GL_Have_TextureCompression() return (GL_CheckExtension("GL_EXT_texture_compression_s3tc") && GL_CheckExtension("GL_ARB_texture_compression")); } -float tooltipdb; void loadTooltips() { tooltipdb = db_load(language_filename("tooltips.db")); diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh index 3844c7558..78584a9b2 100644 --- a/qcsrc/menu/xonotic/util.qh +++ b/qcsrc/menu/xonotic/util.qh @@ -16,6 +16,7 @@ void setDependentAND3(entity e, string theCvarName, float theCvarMin, float theC void setDependentStringNotEqual(entity e, string theCvarName, string theCvarValue); void setDependentWeird(entity e, float(entity) func); +float tooltipdb; void loadTooltips(); void unloadTooltips(); string getZonedTooltipForIdentifier(string s);