r5798 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-07 12:29:11 -0500 (Sat, 07 Feb 2009)
New Revision: 5798

Modified:
   trunk/data/qcsrc/server/ctf.qc
Log:
make sure flags grow back after being squished


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-02-07 12:18:33 UTC (rev 5797)
+++ trunk/data/qcsrc/server/ctf.qc	2009-02-07 17:29:11 UTC (rev 5798)
@@ -1,3 +1,6 @@
+#define FLAG_MIN (PL_MIN + '0 0 -13')
+#define FLAG_MAX (PL_MAX + '0 0 -13')
+
 .entity sprite;
 entity ctf_worldflaglist; // CTF flags in the map
 .entity ctf_worldflagnext;
@@ -305,6 +308,15 @@
 
 	self.nextthink = time + 0.1;
 
+	// sorry, we have to reset the flag size if it got squished by something
+	if(self.mins != FLAG_MIN || self.maxs != FLAG_MAX)
+	{
+		// if we can grow back, grow back
+		tracebox(self.origin, FLAG_MIN, FLAG_MAX, self.origin, MOVE_NOMONSTERS, self);
+		if(!trace_startsolid)
+			setsize(self, FLAG_MIN, FLAG_MAX);
+	}
+
 	if(self == ctf_worldflaglist) // only for the first flag
 	{
 		FOR_EACH_CLIENT(e)
@@ -719,7 +731,7 @@
 	precache_sound (self.noise2);
 	precache_sound (self.noise3);
 	//setsize(self, '-16 -16 -37', '16 16 37');
-	setsize(self, PL_MIN + '0 0 -13', PL_MAX + '0 0 -13');
+	setsize(self, FLAG_MIN, FLAG_MAX);
 	setorigin(self, self.origin + '0 0 37');
 	self.nextthink = time + 0.2; // start after doors etc
 	self.think = place_flag;
@@ -817,7 +829,7 @@
 	precache_sound (self.noise2);
 	precache_sound (self.noise3);
 	//setsize(self, '-16 -16 -37', '16 16 37');
-	setsize(self, PL_MIN + '0 0 -13', PL_MAX + '0 0 -13');
+	setsize(self, FLAG_MIN, FLAG_MAX);
 	setorigin(self, self.origin + '0 0 37');
 	self.nextthink = time + 0.2; // start after doors etc
 	self.think = place_flag;