r5454 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-08 09:46:18 -0500 (Thu, 08 Jan 2009)
New Revision: 5454

Modified:
   trunk/data/qcsrc/server/g_lights.qc
   trunk/data/qcsrc/server/g_subs.qc
   trunk/data/qcsrc/server/t_plats.qc
Log:
only show errors about broken func_rotatings ONCE; make dynlight and SolidBSP triggers no longer MOVETYPE_PUSH (why were they?)


Modified: trunk/data/qcsrc/server/g_lights.qc
===================================================================
--- trunk/data/qcsrc/server/g_lights.qc	2009-01-08 13:02:10 UTC (rev 5453)
+++ trunk/data/qcsrc/server/g_lights.qc	2009-01-08 14:46:18 UTC (rev 5454)
@@ -119,7 +119,7 @@
 	if (self.target)
 //	if (!(self.spawnflags & DFOLLOW))
 	{
-		self.movetype = MOVETYPE_PUSH;
+		self.movetype = MOVETYPE_NOCLIP;
 		if (!self.speed)
 			self.speed = 100;
 		InitializeEntity(self, dynlight_find_path, INITPRIO_FINDTARGET);

Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc	2009-01-08 13:02:10 UTC (rev 5453)
+++ trunk/data/qcsrc/server/g_subs.qc	2009-01-08 14:46:18 UTC (rev 5454)
@@ -587,16 +587,22 @@
 		SetMovedir ();
 	self.solid = SOLID_BSP;
 	SetBrushEntityModel();
-	self.movetype = MOVETYPE_PUSH;
+	self.movetype = MOVETYPE_NONE; // why was this PUSH? -div0
 //	self.modelindex = 0;
 	self.model = "";
 };
 
-void InitMovingBrushTrigger()
+float InitMovingBrushTrigger()
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
 	self.solid = SOLID_BSP;
 	SetBrushEntityModel();
 	self.movetype = MOVETYPE_PUSH;
+	if(self.modelindex == 0)
+	{
+		objerror("InitMovingBrushTrigger: no brushes found!");
+		return 0;
+	}
+	return 1;
 };

Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc	2009-01-08 13:02:10 UTC (rev 5453)
+++ trunk/data/qcsrc/server/t_plats.qc	2009-01-08 14:46:18 UTC (rev 5454)
@@ -198,7 +198,8 @@
 	self.angles = '0 0 0';
 
 	self.classname = "plat";
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	self.effects |= EF_LOWPRECISION;
 	setsize (self, self.mins , self.maxs);
 
@@ -282,7 +283,8 @@
 	if (!self.speed)
 		self.speed = 100;
 
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	self.effects |= EF_LOWPRECISION;
 
 	// wait for targets to spawn
@@ -346,7 +348,8 @@
 
     self.dmgtime2 = time;
 
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	// no EF_LOWPRECISION here, as rounding angles is bad
 
     self.blocked = rotating_blocked;
@@ -418,7 +421,8 @@
 	else // Z
 		self.movedir = '0 0 1' * self.height;
 
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 
 	// wait for targets to spawn
 	controller = spawn();
@@ -550,7 +554,8 @@
 {
 	SetMovedir ();
 
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	self.effects |= EF_LOWPRECISION;
 
 	self.blocked = button_blocked;
@@ -1150,7 +1155,8 @@
 	SetMovedir ();
 
 	self.max_health = self.health;
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	self.effects |= EF_LOWPRECISION;
 	self.classname = "door";
 
@@ -1262,7 +1268,8 @@
 	self.angles = '0 0 0';
 
 	self.max_health = self.health;
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	//self.effects |= EF_LOWPRECISION;
 	self.classname = "door_rotating";
 
@@ -1517,7 +1524,8 @@
 	self.mangle = self.angles;
 	self.angles = '0 0 0';
 	self.classname = "door";
-	InitMovingBrushTrigger();
+	if not(InitMovingBrushTrigger())
+		return;
 	self.effects |= EF_LOWPRECISION;
 
 	self.touch = secret_touch;