r4043 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-06 10:07:29 -0400 (Wed, 06 Aug 2008)
New Revision: 4043

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:
should fix volumes becoming 0


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-08-06 13:54:24 UTC (rev 4042)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-08-06 14:07:29 UTC (rev 4043)
@@ -54,7 +54,7 @@
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_entchannel3volume");
-		s.saveCvars = saveCvarsMulti; s.cvarNames = "snd_playerchannel0volume snd_playerchannel3volume";
+		makeMulti(s, "snd_playerchannel0volume snd_playerchannel3volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Items:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
@@ -69,7 +69,7 @@
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel7volume");
-		s.saveCvars = saveCvarsMulti; s.cvarNames = "snd_entchannel7volume"; // gib sounds
+		makeMulti(s, "snd_entchannel7volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Player:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
@@ -77,7 +77,7 @@
 	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
+		makeMulti(s, "snd_playerchannel4volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Shots:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");

Modified: trunk/data/qcsrc/menu/nexuiz/util.qc
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/util.qc	2008-08-06 13:54:24 UTC (rev 4042)
+++ trunk/data/qcsrc/menu/nexuiz/util.qc	2008-08-06 14:07:29 UTC (rev 4043)
@@ -26,18 +26,28 @@
 	forAllDescendants(root, loadCvarsOf, SUB_Null_ee, NULL);
 }
 
-.string cvarNames;
+.string cvarNames_Multi;
+.void(entity me) saveCvars_Multi;
 void saveCvarsMulti(entity me)
 {
 	float n, i;
 	string s;
-	n = tokenize(me.cvarNames);
-	s = ftos(me.value);
-	cvar_set(me.cvarName, s);
+
+	me.saveCvars_Multi(me);
+	s = cvar_string(me.cvarName);
+
+	n = tokenize(me.cvarNames_Multi);
 	for(i = 0; i < n; ++i)
 		cvar_set(argv(i), s);
 }
 
+void makeMulti(entity e, string otherCvars)
+{
+	e.cvarNames_Multi = otherCvars;
+	e.saveCvars_Multi = e.saveCvars;
+	e.saveCvars = saveCvarsMulti;
+}
+
 .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 13:54:24 UTC (rev 4042)
+++ trunk/data/qcsrc/menu/nexuiz/util.qh	2008-08-06 14:07:29 UTC (rev 4043)
@@ -2,8 +2,7 @@
 void saveAllCvars(entity root);
 void loadAllCvars(entity root);
 
-.string cvarNames;
-void saveCvarsMulti(entity me);
+void makeMulti(entity me, string otherCvars);
 
 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);