r4038 - trunk/data/qcsrc/menu/nexuiz

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Aug 6 08:34:37 EDT 2008


Author: div0
Date: 2008-08-06 08:34:37 -0400 (Wed, 06 Aug 2008)
New Revision: 4038

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
   trunk/data/qcsrc/menu/nexuiz/util.qc
   trunk/data/qcsrc/menu/nexuiz/util.qh
Log:
the fitting menu changes


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-08-06 12:34:27 UTC (rev 4037)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-08-06 12:34:37 UTC (rev 4038)
@@ -39,64 +39,60 @@
 		me.TD(me, 1, 2, s);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
-		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
-		setDependentStringNotEqual(s, "volume", "0");
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel0volume");
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_worldchannel0volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Announcer/Chat:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel1volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Weapon fire:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel2volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Voice/Radio:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel6volume");
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Pain:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel3volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Triggers:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel7volume");
+		s.saveCvars = saveCvarsMulti; s.cvarNames = "snd_entchannel7volume"; // gib sounds
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Player body:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel4volume");
+		s.saveCvars = saveCvarsMulti; s.cvarNames = "snd_playerchannel4volume"; // hits to player
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Projectiles:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel5volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Powerups:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel3volume");
+		s.saveCvars = saveCvarsMulti; s.cvarNames = "snd_playerchannel0volume snd_playerchannel3volume";
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Triggers/Items:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel6volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Pain:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel2volume");
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Voice/Radio:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel7volume");
-		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Player body:"));
+		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel1volume");
+		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Weapon fire:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");

Modified: trunk/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qc	2008-08-06 12:34:27 UTC (rev 4037)
+++ trunk/data/qcsrc/menu/nexuiz/util.qc	2008-08-06 12:34:37 UTC (rev 4038)
@@ -26,6 +26,18 @@
 	forAllDescendants(root, loadCvarsOf, SUB_Null_ee, NULL);
 }
 
+.string cvarNames;
+void saveCvarsMulti(entity me)
+{
+	float n, i;
+	string s;
+	n = tokenize(me.cvarNames);
+	s = ftos(me.value);
+	cvar_set(me.cvarName, s);
+	for(i = 0; i < n; ++i)
+		cvar_set(argv(i), s);
+}
+
 .void(entity) draw_setDependent;
 .string cvar_setDependent;
 .float cvarMin_setDependent;

Modified: trunk/data/qcsrc/menu/nexuiz/util.qh
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qh	2008-08-06 12:34:27 UTC (rev 4037)
+++ trunk/data/qcsrc/menu/nexuiz/util.qh	2008-08-06 12:34:37 UTC (rev 4038)
@@ -2,6 +2,9 @@
 void saveAllCvars(entity root);
 void loadAllCvars(entity root);
 
+.string cvarNames;
+void saveCvarsMulti(entity me);
+
 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);




More information about the nexuiz-commits mailing list