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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-05 11:13:06 -0500 (Tue, 05 Jan 2010)
New Revision: 8480

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
   trunk/data/qcsrc/menu/nexuiz/textslider.c
Log:
add a multi-cvar single-value tgo the text slider


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c	2010-01-05 16:10:04 UTC (rev 8479)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_advanced.c	2010-01-05 16:13:06 UTC (rev 8480)
@@ -57,10 +57,10 @@
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeNexuizTextLabel(0, "Teams:"));
 		me.TD(me, 1, 1.7, e = makeNexuizTextSlider("g_tdm_teams_override g_domination_teams_override g_keyhunt_teams_override"));
-			e.addValue(e, "Default", "0 0 0");
-			e.addValue(e, "2 teams", "2 2 2");
-			e.addValue(e, "3 teams", "3 3 3");
-			e.addValue(e, "4 teams", "4 4 4");
+			e.addValue(e, "Default", "0");
+			e.addValue(e, "2 teams", "2");
+			e.addValue(e, "3 teams", "3");
+			e.addValue(e, "4 teams", "4");
 			e.configureNexuizTextSliderValues(e);
 
 	me.gotoRC(me, me.rows - 1, 0);

Modified: trunk/data/qcsrc/menu/nexuiz/textslider.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/textslider.c	2010-01-05 16:10:04 UTC (rev 8479)
+++ trunk/data/qcsrc/menu/nexuiz/textslider.c	2010-01-05 16:13:06 UTC (rev 8480)
@@ -77,12 +77,20 @@
 		}
 		else
 		{
+			float i;
 			var float m = tokenize_console(strcat(me.cvarName, " ", me.getIdentifier(me)));
-			if(m != n * 2)
+			if(m == n + 1)
+			{
+				for(i = 0; i < n; ++i)
+					cvar_set(argv(i), argv(n));
+			}
+			else if(m == n * 2)
+			{
+				for(i = 0; i < n; ++i)
+					cvar_set(argv(i), argv(i + n));
+			}
+			else
 				error("NexuizTextSlider: invalid identifier ", me.getIdentifier(me), " does not match cvar list ", me.cvarName);
-			float i;
-			for(i = 0; i < n; ++i)
-				cvar_set(argv(i), argv(i + n));
 		}
 	}
 }