r4878 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-25 15:12:57 -0400 (Sat, 25 Oct 2008)
New Revision: 4878

Modified:
   trunk/data/qcsrc/server/t_plats.qc
Log:
fix message of linked doors


Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc	2008-10-25 18:58:22 UTC (rev 4877)
+++ trunk/data/qcsrc/server/t_plats.qc	2008-10-25 19:12:57 UTC (rev 4878)
@@ -700,7 +700,11 @@
 	self.state = STATE_UP;
 	SUB_CalcMove (self.pos2, self.speed, door_hit_top);
 
+	string oldmessage;
+	oldmessage = self.message;
+	self.message = "";
 	SUB_UseTargets();
+	self.message = oldmessage;
 };
 
 
@@ -716,13 +720,10 @@
 {
 	local entity 	oself;
 	local entity	starte;
-	string oldmessage;
 
 	if (self.owner != self)
 		objerror ("door_fire: self.owner != self");
 
-	oldmessage = self.message;
-	self.message = ""; // no more message
 	oself = self;
 
 	if (self.spawnflags & DOOR_TOGGLE)
@@ -748,8 +749,6 @@
 		self = self.enemy;
 	} while ( (self != starte) && (self != world) );
 	self = oself;
-
-	self.message = oldmessage;
 };
 
 
@@ -817,7 +816,7 @@
 
 	self.owner.attack_finished_single = time + 2;
 
-	if (!self.dmg && self.owner.message != "")
+	if (!(self.owner.dmg) && (self.owner.message != ""))
 	{
 		if (other.flags & FL_CLIENT)
 			centerprint (other, self.owner.message);
@@ -1024,8 +1023,6 @@
 		self.wait = 3;
 	if (!self.lip)
 		self.lip = 8;
-	if (!self.dmg)
-		self.dmg = 2;
 
 	self.pos1 = self.origin;
 	self.pos2 = self.pos1 + self.movedir*(fabs(self.movedir*self.size) - self.lip);