From 538757b7e727ca9f58da9e81b864d11757d2c625 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 31 May 2009 10:54:45 +0000 Subject: [PATCH] cleanup git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6820 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/checkbox.c | 5 ++--- data/qcsrc/menu/nexuiz/gametypebutton.c | 5 ++--- data/qcsrc/menu/nexuiz/inputbox.c | 5 ++--- data/qcsrc/menu/nexuiz/radiobutton.c | 5 ++--- data/qcsrc/menu/nexuiz/slider.c | 5 ++--- data/qcsrc/menu/nexuiz/textslider.c | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/checkbox.c b/data/qcsrc/menu/nexuiz/checkbox.c index b9c415b81..5ec97bff8 100644 --- a/data/qcsrc/menu/nexuiz/checkbox.c +++ b/data/qcsrc/menu/nexuiz/checkbox.c @@ -64,9 +64,8 @@ void configureNexuizCheckBoxNexuizCheckBox(entity me, float theYesValue, float t if(theCvar) { me.cvarName = theCvar; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); me.loadCvars(me); } me.configureCheckBox(me, theText, me.fontSize, me.image); diff --git a/data/qcsrc/menu/nexuiz/gametypebutton.c b/data/qcsrc/menu/nexuiz/gametypebutton.c index 939140fd8..faf862e56 100644 --- a/data/qcsrc/menu/nexuiz/gametypebutton.c +++ b/data/qcsrc/menu/nexuiz/gametypebutton.c @@ -35,9 +35,8 @@ void configureNexuizGametypeButtonNexuizGametypeButton(entity me, float theGroup if(theCvar) { me.cvarName = theCvar; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); me.loadCvars(me); } me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0); diff --git a/data/qcsrc/menu/nexuiz/inputbox.c b/data/qcsrc/menu/nexuiz/inputbox.c index 825ce04cb..5fb7964d4 100644 --- a/data/qcsrc/menu/nexuiz/inputbox.c +++ b/data/qcsrc/menu/nexuiz/inputbox.c @@ -39,9 +39,8 @@ void configureNexuizInputBoxNexuizInputBox(entity me, float doEditColorCodes, st if(theCvar) { me.cvarName = theCvar; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); me.loadCvars(me); } me.cursorPos = strlen(me.text); diff --git a/data/qcsrc/menu/nexuiz/radiobutton.c b/data/qcsrc/menu/nexuiz/radiobutton.c index a369e3431..5ccf0bef7 100644 --- a/data/qcsrc/menu/nexuiz/radiobutton.c +++ b/data/qcsrc/menu/nexuiz/radiobutton.c @@ -36,9 +36,8 @@ void configureNexuizRadioButtonNexuizRadioButton(entity me, float theGroup, stri { me.cvarName = theCvar; me.cvarValue = theValue; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); me.loadCvars(me); } me.configureRadioButton(me, theText, me.fontSize, me.image, theGroup, 0); diff --git a/data/qcsrc/menu/nexuiz/slider.c b/data/qcsrc/menu/nexuiz/slider.c index fa855b310..73819b9f9 100644 --- a/data/qcsrc/menu/nexuiz/slider.c +++ b/data/qcsrc/menu/nexuiz/slider.c @@ -44,9 +44,8 @@ void configureNexuizSliderNexuizSlider(entity me, float theValueMin, float theVa if(theCvar) { me.cvarName = theCvar; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); me.loadCvars(me); } } diff --git a/data/qcsrc/menu/nexuiz/textslider.c b/data/qcsrc/menu/nexuiz/textslider.c index bb9848f14..a98f1ebba 100644 --- a/data/qcsrc/menu/nexuiz/textslider.c +++ b/data/qcsrc/menu/nexuiz/textslider.c @@ -38,9 +38,8 @@ void configureNexuizTextSliderNexuizTextSlider(entity me, string theCvar) if(theCvar) { me.cvarName = theCvar; - if not(cvar_type(theCvar) & CVAR_TYPEFLAG_ENGINE) - if(cvar_description(theCvar) != "custom cvar") - me.tooltip = strzone(cvar_description(theCvar)); + if((cvar_type(theCvar) & (CVAR_TYPEFLAG_ENGINE | CVAR_TYPEFLAG_HASDESCRIPTION)) == CVAR_TYPEFLAG_HASDESCRIPTION) + me.tooltip = strzone(cvar_description(theCvar)); // don't load it yet } } -- 2.39.2