[nexuiz-commits] r6304 - in trunk/data/qcsrc: menu/nexuiz server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-26 05:59:14 -0400 (Thu, 26 Mar 2009)
New Revision: 6304

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
fix g_weapon_stay 2, and make it the default in the menu for weapon stay mutator


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-03-26 09:49:13 UTC (rev 6303)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-03-26 09:59:14 UTC (rev 6304)
@@ -173,7 +173,7 @@
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_pinata", "Pinata"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_weapon_stay", "Weapons stay"));
+		me.TD(me, 1, 2, e = makeNexuizCheckBoxEx(2, 0, "g_weapon_stay", "Weapons stay"));
 	me.TR(me);
 		s = makeNexuizSlider(10, 50, 1, "g_bloodloss");
 		me.TD(me, 1, 2, e = makeNexuizSliderCheckBox(0, 1, s, "Blood loss"));

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-03-26 09:49:13 UTC (rev 6303)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_effects.c	2009-03-26 09:59:14 UTC (rev 6304)
@@ -139,8 +139,7 @@
 
 	me.TR(me);
 		if(cvar("developer"))
-			me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_showsurfaces", "Show surfaces"));
-				e.yesValue = 3;
+			me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
 
 	me.TR(me);
 		me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping"));

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c	2009-03-26 09:49:13 UTC (rev 6303)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c	2009-03-26 09:59:14 UTC (rev 6304)
@@ -72,8 +72,6 @@
 			e.addValue(e, "Long", "2");
 			e.configureNexuizTextSliderValues(e);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showpressedkeys", "Show pressed keys"));
-			e.noValue = 0;
-			e.yesValue = 2;
+		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "cl_showpressedkeys", "Show pressed keys"));
 }
 #endif

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2009-03-26 09:49:13 UTC (rev 6303)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2009-03-26 09:59:14 UTC (rev 6304)
@@ -52,9 +52,7 @@
 		me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "showtopspeed", "Also show top speed"));
-			e.yesValue = -1;
-			e.noValue = 0;
+		me.TD(me, 1, 2.8, e = makeNexuizCheckBoxEx(-1, 0, "showtopspeed", "Also show top speed"));
 			setDependent(e, "showspeed", 0.5, -0.5);
 	me.TR(me);
 	me.TR(me);

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-03-26 09:49:13 UTC (rev 6303)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-03-26 09:59:14 UTC (rev 6304)
@@ -959,13 +959,13 @@
 	if(g_weapon_stay == 2)
 	{
 		if(!start_ammo_shells) start_ammo_shells = g_pickup_shells;
-		if(!start_ammo_nails) start_ammo_shells = g_pickup_nails;
-		if(!start_ammo_cells) start_ammo_shells = g_pickup_cells;
-		if(!start_ammo_rockets) start_ammo_shells = g_pickup_rockets;
+		if(!start_ammo_nails) start_ammo_nails = g_pickup_nails;
+		if(!start_ammo_cells) start_ammo_cells = g_pickup_cells;
+		if(!start_ammo_rockets) start_ammo_rockets = g_pickup_rockets;
 		if(!warmup_start_ammo_shells) warmup_start_ammo_shells = g_pickup_shells;
-		if(!warmup_start_ammo_nails) warmup_start_ammo_shells = g_pickup_nails;
-		if(!warmup_start_ammo_cells) warmup_start_ammo_shells = g_pickup_cells;
-		if(!warmup_start_ammo_rockets) warmup_start_ammo_shells = g_pickup_rockets;
+		if(!warmup_start_ammo_nails) warmup_start_ammo_nails = g_pickup_nails;
+		if(!warmup_start_ammo_cells) warmup_start_ammo_cells = g_pickup_cells;
+		if(!warmup_start_ammo_rockets) warmup_start_ammo_rockets = g_pickup_rockets;
 	}
 
 	start_ammo_shells = max(0, start_ammo_shells);