From 6c881131dd6a45d9140c398cd20b4cc7b731f850 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 2 Jan 2009 20:36:36 +0000
Subject: [PATCH] unbreak rain and pointparticles

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5385 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/g_triggers.qc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc
index 0eef7040f..ed421b41f 100644
--- a/data/qcsrc/server/g_triggers.qc
+++ b/data/qcsrc/server/g_triggers.qc
@@ -544,7 +544,7 @@ float pointparticles_SendEntity(entity to, float fl)
 	}
 	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 @@ void spawnfunc_func_rain()
 	self.movetype = MOVETYPE_NONE;
 	self.solid = SOLID_NOT;
 	SetBrushEntityModel();
-	self.model = "";
 	if (!self.cnt)
 		self.cnt = 12;
 	if (!self.count)
@@ -700,7 +699,15 @@ void spawnfunc_func_rain()
 	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);
+	}
 };
 
 
-- 
2.39.2