r5164 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-03 15:22:21 -0500 (Wed, 03 Dec 2008)
New Revision: 5164

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
   trunk/data/qcsrc/menu/nexuiz/util.qc
   trunk/data/qcsrc/menu/nexuiz/util.qh
Log:
make deluxemapping also depend on lightmaps activated


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2008-12-03 19:44:04 UTC (rev 5163)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2008-12-03 20:22:21 UTC (rev 5164)
@@ -128,7 +128,7 @@
 		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping"));
 			setDependent(e, "r_glsl", 1, 1);
 		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss"));
-			setDependentAND(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 1);
+			setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 1, "mod_q3bsp_nolightmaps", 0, 0);
 	
 	me.TR(me);
 	me.TR(me);

Modified: trunk/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qc	2008-12-03 19:44:04 UTC (rev 5163)
+++ trunk/data/qcsrc/menu/nexuiz/util.qc	2008-12-03 20:22:21 UTC (rev 5164)
@@ -55,6 +55,9 @@
 .string cvar2_setDependent;
 .float cvar2Min_setDependent;
 .float cvar2Max_setDependent;
+.string cvar3_setDependent;
+.float cvar3Min_setDependent;
+.float cvar3Max_setDependent;
 .float op_setDependent;
 .string cvarString_setDependent;
 .string cvarValue_setDependent;
@@ -85,6 +88,14 @@
 			else
 				e.disabled = (e.disabled + ((f >= e.cvar2Max_setDependent) && (f <= e.cvar2Min_setDependent)) > e.op_setDependent);
 		}
+		if(e.cvar3_setDependent)
+		{
+			f = cvar(e.cvar3_setDependent);
+			if(e.cvar3Min_setDependent <= e.cvar3Max_setDependent)
+				e.disabled = (e.disabled + ((f < e.cvar3Min_setDependent) || (f > e.cvar3Max_setDependent)) > e.op_setDependent);
+			else
+				e.disabled = (e.disabled + ((f >= e.cvar3Max_setDependent) && (f <= e.cvar3Min_setDependent)) > e.op_setDependent);
+		}
 	}
 }
 void setDependent_Draw(entity e)
@@ -99,6 +110,7 @@
 	e.cvarMin_setDependent = theCvarMin;
 	e.cvarMax_setDependent = theCvarMax;
 	e.cvar2_setDependent = string_null;
+	e.cvar3_setDependent = string_null;
 	e.draw = setDependent_Draw;
 	setDependent_Check(e);
 }
@@ -109,6 +121,7 @@
 	e.cvarValue_setDependent = theCvarValue;
 	e.cvar_setDependent = string_null;
 	e.cvar2_setDependent = string_null;
+	e.cvar3_setDependent = string_null;
 	e.draw = setDependent_Draw;
 	setDependent_Check(e);
 }
@@ -121,6 +134,7 @@
 	e.cvar2_setDependent = theCvar2Name;
 	e.cvar2Min_setDependent = theCvar2Min;
 	e.cvar2Max_setDependent = theCvar2Max;
+	e.cvar3_setDependent = string_null;
 	e.op_setDependent = 0;
 	e.draw = setDependent_Draw;
 	setDependent_Check(e);
@@ -134,10 +148,27 @@
 	e.cvar2_setDependent = theCvar2Name;
 	e.cvar2Min_setDependent = theCvar2Min;
 	e.cvar2Max_setDependent = theCvar2Max;
+	e.cvar3_setDependent = string_null;
 	e.op_setDependent = 1;
 	e.draw = setDependent_Draw;
 	setDependent_Check(e);
 }
+void setDependentAND3(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max, string theCvar3Name, float theCvar3Min, float theCvar3Max)
+{
+	e.draw_setDependent = e.draw;
+	e.cvar_setDependent = theCvarName;
+	e.cvarMin_setDependent = theCvarMin;
+	e.cvarMax_setDependent = theCvarMax;
+	e.cvar2_setDependent = theCvar2Name;
+	e.cvar2Min_setDependent = theCvar2Min;
+	e.cvar2Max_setDependent = theCvar2Max;
+	e.cvar3_setDependent = theCvar3Name;
+	e.cvar3Min_setDependent = theCvar3Min;
+	e.cvar3Max_setDependent = theCvar3Max;
+	e.op_setDependent = 0;
+	e.draw = setDependent_Draw;
+	setDependent_Check(e);
+}
 
 // EXTRESPONSE SYSTEM ////////////////////////////////////////////////////////
 

Modified: trunk/data/qcsrc/menu/nexuiz/util.qh
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qh	2008-12-03 19:44:04 UTC (rev 5163)
+++ trunk/data/qcsrc/menu/nexuiz/util.qh	2008-12-03 20:22:21 UTC (rev 5164)
@@ -7,4 +7,5 @@
 void setDependent(entity e, string theCvarName, float theCvarMin, float theCvarMax);
 void setDependentAND(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max);
 void setDependentOR(entity e, string theCvarName, float theCvarMin, float theCvarMax, string theCvar2Name, float theCvar2Min, float theCvar2Max);
+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);