r4751 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-14 05:43:40 -0400 (Tue, 14 Oct 2008)
New Revision: 4751

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
Log:
new bugs, new bugs!
r4750 | div0 | 2008-10-14 11:41:39 +0200 (Tue, 14 Oct 2008) | 2 lines
work around new fteqcc bug :(


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-10-14 09:41:39 UTC (rev 4750)
+++ branches/nexuiz-2.0/.patchsets	2008-10-14 09:43:40 UTC (rev 4751)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4748
+revisions_applied = 1-4750

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2008-10-14 09:41:39 UTC (rev 4750)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2008-10-14 09:43:40 UTC (rev 4751)
@@ -616,6 +616,8 @@
 }
 void register_weapons_done()
 {
+	entity wi;
+
 	dummy_weapon_info = spawn();
 	dummy_weapon_info.classname = "weapon_info";
 	dummy_weapon_info.weapon = 0;
@@ -638,12 +640,18 @@
 	float imp;
 	weaponpriority_hudselector_1 = "";
 	for(i = 1; i <= 24; ++i)
-		if(weapon_info[i-1] && weapon_info[i-1].impulse == 0)
+	{
+		wi = weapon_info[i-1];
+		if(wi && wi.impulse == 0)
 			weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+	}
 	for(imp = 9; imp > 0; --imp)
 		for(i = 1; i <= 24; ++i)
-			if(weapon_info[i-1] && weapon_info[i-1].impulse == imp)
+		{
+			wi = weapon_info[i-1];
+			if(wi && wi.impulse == imp)
 				weaponpriority_hudselector_1 = strcat(weaponpriority_hudselector_1, " ", ftos(i));
+		}
 
 	weaponpriority_hudselector_0 = strzone(substring(weaponpriority_hudselector_0, 1, strlen(weaponpriority_hudselector_0) - 1));
 	weaponpriority_hudselector_1 = strzone(substring(weaponpriority_hudselector_1, 1, strlen(weaponpriority_hudselector_1) - 1));