r6083 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-08 15:57:50 -0400 (Sun, 08 Mar 2009)
New Revision: 6083

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
Log:
r6081 | m0rfar | 2009-03-08 13:59:13 +0100 (Sun, 08 Mar 2009) | 1 line
No one should want to have more than 100 in netfps imo
r6082 | div0 | 2009-03-08 20:47:39 +0100 (Sun, 08 Mar 2009) | 2 lines
fix "corona in air" bug when a strength player got gibbed


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-08 19:47:39 UTC (rev 6082)
+++ branches/nexuiz-2.0/.patchsets	2009-03-08 19:57:50 UTC (rev 6083)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6079
+revisions_applied = 1-6039,6044-6082

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c	2009-03-08 19:47:39 UTC (rev 6082)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c	2009-03-08 19:57:50 UTC (rev 6083)
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(NexuizNetworkSettingsTab) EXTENDS(NexuizTab)
 	METHOD(NexuizNetworkSettingsTab, fill, void(entity))
-	ATTRIB(NexuizNetworkSettingsTab, title, string, "Audio")
+	ATTRIB(NexuizNetworkSettingsTab, title, string, "Network")
 	ATTRIB(NexuizNetworkSettingsTab, intendedWidth, float, 0.9)
 	ATTRIB(NexuizNetworkSettingsTab, rows, float, 17)
 	ATTRIB(NexuizNetworkSettingsTab, columns, float, 6.5)
@@ -40,7 +40,7 @@
 			e.configureNexuizTextSliderValues(e);
     me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Input packets/s:"));
-		me.TD(me, 1, 2, e = makeNexuizSlider(20, 120, 1, "cl_netfps"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(20, 100, 1, "cl_netfps"));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "HTTP downloads:"));

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-08 19:47:39 UTC (rev 6082)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-08 19:57:50 UTC (rev 6083)
@@ -1615,7 +1615,11 @@
 		return;
 	}
 
-	self.effects = self.effects - (self.effects & (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT));
+	self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
+
+	if(!self.modelindex) // don't apply the flags if the player is gibbed
+		return;
+
 	if (self.items & IT_STRENGTH)
 	{
 		self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);