r4082 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-09 15:52:21 -0400 (Sat, 09 Aug 2008)
New Revision: 4082

Modified:
   trunk/data/qcsrc/server/g_subs.qc
   trunk/data/qcsrc/server/t_teleporters.qc
Log:
make mins/maxs only triggers work


Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc	2008-08-09 19:44:54 UTC (rev 4081)
+++ trunk/data/qcsrc/server/g_subs.qc	2008-08-09 19:52:21 UTC (rev 4082)
@@ -379,7 +379,14 @@
 	if (self.angles != '0 0 0')
 		SetMovedir ();
 	self.solid = SOLID_TRIGGER;
-	setmodel (self, self.model);	// set size and link into world, no precision needed
+	if(self.model != "")
+		setmodel (self, self.model);	// set size and link into world, no precision needed
+	else
+	{
+		// force relinking
+		setorigin(self, self.origin);
+		setsize (self, self.mins, self.maxs);
+	}
 	self.movetype = MOVETYPE_NONE;
 	self.modelindex = 0;
 	self.model = "";
@@ -395,6 +402,12 @@
 	self.solid = SOLID_BSP;
 	if(self.model != "")
 		setmodel (self, self.model);	// set size and link into world, no precision needed
+	else
+	{
+		// force relinking
+		setorigin(self, self.origin);
+		setsize (self, self.mins, self.maxs);
+	}
 	self.movetype = MOVETYPE_PUSH;
 //	self.modelindex = 0;
 	self.model = "";

Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc	2008-08-09 19:44:54 UTC (rev 4081)
+++ trunk/data/qcsrc/server/t_teleporters.qc	2008-08-09 19:52:21 UTC (rev 4082)
@@ -185,6 +185,12 @@
 
 	if(self.model != "")
 		setmodel (self, self.model); // no precision needed
+	else
+	{
+		// force relinking
+		setorigin(self, self.origin);
+		setsize (self, self.mins, self.maxs);
+	}
 
 	self.model = "";
 	self.modelindex = 0;