r4206 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-26 12:58:22 -0400 (Tue, 26 Aug 2008)
New Revision: 4206

Modified:
   trunk/data/qcsrc/client/particles.qc
   trunk/data/qcsrc/server/g_triggers.qc
Log:
got it to work with brush ents


Modified: trunk/data/qcsrc/client/particles.qc
===================================================================
--- trunk/data/qcsrc/client/particles.qc	2008-08-26 16:47:19 UTC (rev 4205)
+++ trunk/data/qcsrc/client/particles.qc	2008-08-26 16:58:22 UTC (rev 4206)
@@ -1,4 +1,3 @@
-#ifdef POINTINBRUSH_WORKS
 vector PointInBrush_vec;
 entity PointInBrush_brush;
 entity PointInBrush_allmask;
@@ -39,7 +38,6 @@
 
 	return f;
 }
-#endif
 
 .float cnt; // effect number
 .vector velocity; // particle velocity
@@ -67,9 +65,7 @@
 		p_x += random() * sz_x;
 		p_y += random() * sz_y;
 		p_z += random() * sz_z;
-#ifdef POINTINBRUSH_WORKS
 		if(PointInBrush(self, p))
-#endif
 		{
 			if(self.movedir != '0 0 0')
 			{
@@ -85,13 +81,11 @@
 				sound(self, CHAN_AUTO, self.noise, 1, ATTN_NORM);
 			}
 		}
-#ifdef POINTINBRUSH_WORKS
 		else if(self.absolute)
 		{
 			++fail;
 			--i;
 		}
-#endif
 	}
 	self.origin = o;
 }
@@ -115,14 +109,25 @@
 		self.origin_x = ReadCoord();
 		self.origin_y = ReadCoord();
 		self.origin_z = ReadCoord();
-		self.maxs_x = ReadCoord();
-		self.maxs_y = ReadCoord();
-		self.maxs_z = ReadCoord();
+		if(self.modelindex)
+		{
+			self.mins_x = ReadCoord();
+			self.mins_y = ReadCoord();
+			self.mins_z = ReadCoord();
+			self.maxs_x = ReadCoord();
+			self.maxs_y = ReadCoord();
+			self.maxs_z = ReadCoord();
+		}
+		else
+		{
+			self.maxs_x = ReadCoord();
+			self.maxs_y = ReadCoord();
+			self.maxs_z = ReadCoord();
+			self.mins    = -0.5 * self.maxs;
+			self.maxs    =  0.5 * self.maxs;
+			self.origin  = self.origin - self.mins;
+		}
 
-		self.mins    = -0.5 * self.maxs;
-		self.maxs    =  0.5 * self.maxs;
-		self.origin  = self.origin - self.mins;
-
 		self.cnt = ReadShort(); // effect number
 
 		self.velocity = decompressShortVector(ReadShort());

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-08-26 16:47:19 UTC (rev 4205)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-08-26 16:58:22 UTC (rev 4206)
@@ -499,15 +499,28 @@
 	if(fl & 1)
 	{
 		if(self.modelindex != 4.2)
+		{
 			WriteShort(MSG_ENTITY, self.modelindex);
+			WriteCoord(MSG_ENTITY, self.origin_x);
+			WriteCoord(MSG_ENTITY, self.origin_y);
+			WriteCoord(MSG_ENTITY, self.origin_z);
+			WriteCoord(MSG_ENTITY, self.mins_x);
+			WriteCoord(MSG_ENTITY, self.mins_y);
+			WriteCoord(MSG_ENTITY, self.mins_z);
+			WriteCoord(MSG_ENTITY, self.maxs_x);
+			WriteCoord(MSG_ENTITY, self.maxs_y);
+			WriteCoord(MSG_ENTITY, self.maxs_z);
+		}
 		else
+		{
 			WriteShort(MSG_ENTITY, 0);
-		WriteCoord(MSG_ENTITY, self.origin_x + self.mins_x);
-		WriteCoord(MSG_ENTITY, self.origin_y + self.mins_y);
-		WriteCoord(MSG_ENTITY, self.origin_z + self.mins_z);
-		WriteCoord(MSG_ENTITY, self.maxs_x - self.mins_x);
-		WriteCoord(MSG_ENTITY, self.maxs_y - self.mins_y);
-		WriteCoord(MSG_ENTITY, self.maxs_z - self.mins_z);
+			WriteCoord(MSG_ENTITY, self.origin_x + self.mins_x);
+			WriteCoord(MSG_ENTITY, self.origin_y + self.mins_y);
+			WriteCoord(MSG_ENTITY, self.origin_z + self.mins_z);
+			WriteCoord(MSG_ENTITY, self.maxs_x - self.mins_x);
+			WriteCoord(MSG_ENTITY, self.maxs_y - self.mins_y);
+			WriteCoord(MSG_ENTITY, self.maxs_z - self.mins_z);
+		}
 		WriteShort(MSG_ENTITY, self.cnt);
 		WriteShort(MSG_ENTITY, compressShortVector(self.velocity));
 		WriteShort(MSG_ENTITY, compressShortVector(self.movedir));