r5153 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Dec 2 14:35:53 EST 2008


Author: div0
Date: 2008-12-02 14:35:53 -0500 (Tue, 02 Dec 2008)
New Revision: 5153

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
make lasers work better with wrong particle effect names


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-12-02 13:45:55 UTC (rev 5152)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-12-02 19:35:53 UTC (rev 5153)
@@ -926,7 +926,12 @@
 		if(self.mdl == "none")
 			self.cnt = -1;
 		else
+		{
 			self.cnt = particleeffectnum(self.mdl);
+			if(self.cnt < 0)
+				if(self.dmg)
+					self.cnt = particleeffectnum("laser_deadly");
+		}
 	}
 	else if(!self.cnt)
 	{
@@ -935,6 +940,8 @@
 		else
 			self.cnt = -1;
 	}
+	if(self.cnt < 0)
+		self.cnt = -1;
 
 	if(self.colormod == '0 0 0')
 		if(!self.alpha)




More information about the nexuiz-commits mailing list