r5385 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-02 15:36:36 -0500 (Fri, 02 Jan 2009)
New Revision: 5385

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
unbreak rain and pointparticles


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-01-02 15:27:18 UTC (rev 5384)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-01-02 20:36:36 UTC (rev 5385)
@@ -544,7 +544,7 @@
 	}
 	if(fl & 1)
 	{
-		if(self.modelindex != 4.2)
+		if(self.model != "null")
 		{
 			WriteShort(MSG_ENTITY, self.modelindex);
 			WriteCoord(MSG_ENTITY, self.mins_x);
@@ -685,7 +685,6 @@
 	self.movetype = MOVETYPE_NONE;
 	self.solid = SOLID_NOT;
 	SetBrushEntityModel();
-	self.model = "";
 	if (!self.cnt)
 		self.cnt = 12;
 	if (!self.count)
@@ -700,7 +699,15 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = rainsnow_SendEntity;
 	self.Version = 1;
-	setmodel(self, "null");
+
+	if(!self.modelindex)
+	{
+		vector misave, masave;
+		misave = self.mins;
+		masave = self.maxs;
+		setmodel(self, "null");
+		setsize(self, misave, masave);
+	}
 };