[nexuiz-commits] r6820 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-31 06:54:45 -0400 (Sun, 31 May 2009)
New Revision: 6820

Modified:
   trunk/data/qcsrc/menu/nexuiz/checkbox.c
   trunk/data/qcsrc/menu/nexuiz/gametypebutton.c
   trunk/data/qcsrc/menu/nexuiz/inputbox.c
   trunk/data/qcsrc/menu/nexuiz/radiobutton.c
   trunk/data/qcsrc/menu/nexuiz/slider.c
   trunk/data/qcsrc/menu/nexuiz/textslider.c
Log:
cleanup


Modified: trunk/data/qcsrc/menu/nexuiz/checkbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/checkbox.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/checkbox.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -64,9 +64,8 @@
 	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);

Modified: trunk/data/qcsrc/menu/nexuiz/gametypebutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/gametypebutton.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/gametypebutton.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -35,9 +35,8 @@
 	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);

Modified: trunk/data/qcsrc/menu/nexuiz/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/inputbox.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/inputbox.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -39,9 +39,8 @@
 	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);

Modified: trunk/data/qcsrc/menu/nexuiz/radiobutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/radiobutton.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/radiobutton.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -36,9 +36,8 @@
 	{
 		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);

Modified: trunk/data/qcsrc/menu/nexuiz/slider.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/slider.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/slider.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -44,9 +44,8 @@
 	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);
 	}
 }

Modified: trunk/data/qcsrc/menu/nexuiz/textslider.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/textslider.c	2009-05-31 10:53:26 UTC (rev 6819)
+++ trunk/data/qcsrc/menu/nexuiz/textslider.c	2009-05-31 10:54:45 UTC (rev 6820)
@@ -38,9 +38,8 @@
 	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
 	}
 }