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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-10 14:53:56 -0500 (Sun, 10 Jan 2010)
New Revision: 8492

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
Log:
Fix alignment of the effects dialog; add checkboxes for motion- and damegeblur

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2010-01-09 19:01:04 UTC (rev 8491)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_audio.c	2010-01-10 19:53:56 UTC (rev 8492)
@@ -37,7 +37,6 @@
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
 		makeMulti(s, "snd_entchannel2volume");
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -173,4 +172,4 @@
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart; sendcvar cl_hitsound; sendcvar cl_autotaunt; sendcvar cl_voice_directional; sendcvar cl_voice_directional_taunt_attenuation", COMMANDBUTTON_APPLY));
 }
-#endif
\ No newline at end of file
+#endif

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2010-01-09 19:01:04 UTC (rev 8491)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2010-01-10 19:53:56 UTC (rev 8492)
@@ -31,7 +31,7 @@
 
 void fillNexuizEffectsSettingsTab(entity me)
 {
-	entity e;
+	entity e, s;
 	float n;
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Quality preset:"));
@@ -159,16 +159,19 @@
 		me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom"));
 			setDependent(e, "r_hdr", 0, 0);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
-	me.TR(me);
 	
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Motion blur:"));
-		me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_motionblur"));
+		s = makeNexuizSlider(0.1, 1, 0.1, "r_motionblur");
+		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, s, "Motion blur:"));
+		if(s.value != e.savedValue)
+			e.savedValue = 0.5; // default
+		me.TD(me, 1, 2, s);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage blur:"));
-			setDependent(e, "r_motionblur", 0, 1);
-		me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_damageblur"));
-			setDependent(e, "r_motionblur", 0, 1);
+		s = makeNexuizSlider(0.1, 1, 0.1, "r_damageblur");
+		me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, s, "Damage blur:"));
+		if(s.value != e.savedValue)
+			e.savedValue = 0.4; // default
+		me.TD(me, 1, 2, s);
 	
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));