From ac6c930e151b89d9101bede551f1a1570d7cdb4a Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 13 Jun 2009 17:46:27 +0000 Subject: [PATCH] fix a warning git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7027 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/slider.c | 2 +- data/qcsrc/menu/nexuiz/util.qh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/menu/nexuiz/slider.c b/data/qcsrc/menu/nexuiz/slider.c index c6b88e1d4..bb64cf45a 100644 --- a/data/qcsrc/menu/nexuiz/slider.c +++ b/data/qcsrc/menu/nexuiz/slider.c @@ -41,7 +41,7 @@ void configureNexuizSliderNexuizSlider(entity me, float theValueMin, float theVa vp *= 10; me.configureSliderVisuals(me, me.fontSize, me.align, me.valueSpace, me.image); me.configureSliderValues(me, theValueMin, v, theValueMax, theValueStep, vk, vp); - if(theCvar) + if(theCvar && tooltipdb >= 0) { me.cvarName = theCvar; me.tooltip = getZonedTooltipForIdentifier(theCvar); diff --git a/data/qcsrc/menu/nexuiz/util.qh b/data/qcsrc/menu/nexuiz/util.qh index 75b58896d..c74abc4b2 100644 --- a/data/qcsrc/menu/nexuiz/util.qh +++ b/data/qcsrc/menu/nexuiz/util.qh @@ -10,6 +10,7 @@ void setDependentOR(entity e, string theCvarName, float theCvarMin, float theCva void setDependentAND3(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max, string theCvar3Name, float theCvar3Min, float theCvar3Max); void setDependentStringNotEqual(entity e, string theCvarName, string theCvarValue); +float tooltipdb; void loadTooltips(); void unloadTooltips(); string getZonedTooltipForIdentifier(string s); -- 2.39.2