r5615 - in trunk/data/qcsrc: menu/nexuiz server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-19 04:20:54 -0500 (Mon, 19 Jan 2009)
New Revision: 5615

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c
   trunk/data/qcsrc/server/g_damage.qc
Log:
fix menu layout (make it more consistent); remove another FBL


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c	2009-01-19 08:24:14 UTC (rev 5614)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c	2009-01-19 09:20:54 UTC (rev 5615)
@@ -23,15 +23,15 @@
 	entity e;
 
 	me.TR(me);
-		me.TD(me, 1, 4, e = makeNexuizCheckBox(0, "cl_movement", "Client-side movement prediction"));
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_movement", "Client-side movement prediction"));
 	me.TR(me);
-		me.TD(me, 1, 4, e = makeNexuizCheckBox(1, "cl_nolerp", "Network update smoothing"));
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(1, "cl_nolerp", "Network update smoothing"));
 	me.TR(me);
-		me.TD(me, 1, 4, e = makeNexuizCheckBox(0, "shownetgraph", "Show netgraph"));
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "shownetgraph", "Show netgraph"));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Network speed:"));
-		me.TD(me, 1, 2.5, e = makeNexuizTextSlider("_cl_rate"));
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Network speed:"));
+		me.TD(me, 1, 2, e = makeNexuizTextSlider("_cl_rate"));
 			e.addValue(e, "56k", "4000");
 			e.addValue(e, "ISDN", "7000");
 			e.addValue(e, "Slow ADSL", "15000");
@@ -39,19 +39,19 @@
 			e.addValue(e, "Broadband", "25000");
 			e.configureNexuizTextSliderValues(e);
     me.TR(me);
-		me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Outgoing packets / sec:"));
-		me.TD(me, 1, 2.5, e = makeNexuizSlider(20, 120, 1, "cl_netfps"));
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Outgoing packets/s:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(20, 120, 1, "cl_netfps"));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 4, e = makeNexuizTextLabel(0, "HTTP downloads:"));
+		me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "HTTP downloads:"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.3, e = makeNexuizTextLabel(0, "Max downloads:"));
-		me.TD(me, 1, 2.5, e = makeNexuizSlider(1, 5, 1, "cl_curl_maxdownloads"));
+		me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Downloads:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(1, 5, 1, "cl_curl_maxdownloads"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.3, e = makeNexuizTextLabel(0, "Max speed (KB/s):"));
-		me.TD(me, 1, 2.5, e = makeNexuizSlider(10, 1500, 10, "cl_curl_maxspeed"));
+		me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Speed (kB/s):"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(10, 1500, 10, "cl_curl_maxspeed"));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-01-19 08:24:14 UTC (rev 5614)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-01-19 09:20:54 UTC (rev 5615)
@@ -24,8 +24,6 @@
 
 	entity e;
 
-	org = findbetterlocation(org, 1);
-
 	e = spawn();
 	e.classname = "damageinfo";
 	setorigin(e, org);