r3010 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-12-08 05:52:12 -0500 (Sat, 08 Dec 2007)
New Revision: 3010

Modified:
   trunk/data/qcsrc/server/ctf.qc
Log:
ctf movetype fix


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2007-12-07 22:34:17 UTC (rev 3009)
+++ trunk/data/qcsrc/server/ctf.qc	2007-12-08 10:52:12 UTC (rev 3010)
@@ -1,7 +1,6 @@
 
 .float next_take_time;			// the next time a player can pick up a flag (time + blah)
 								/// I used this, in part, to fix the looping score bug. - avirox
-.float movetype_orig;
 
 //float FLAGSCORE_PICKUP        =  1;
 //float FLAGSCORE_RETURN        =  5; // returned by owner team
@@ -25,7 +24,7 @@
 	self.mdl = self.model;
 	self.flags = FL_ITEM;
 	self.solid = SOLID_TRIGGER;
-	self.movetype = self.movetype_orig;
+	self.movetype = MOVETYPE_NONE;
 	self.velocity = '0 0 0';
 	self.origin_z = self.origin_z + 6;
 	self.think = FlagThink;
@@ -36,12 +35,15 @@
 	self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
 	//self.effects = self.effects | EF_DIMLIGHT;
 	if(!self.noalign)
+	{
+		self.movetype = MOVETYPE_TOSS;
 		if (!droptofloor())
 		{
 			dprint("Flag fell out of level at ", vtos(self.origin), "\n");
 			remove(self);
 			return;
 		}
+	}
 	self.oldorigin = self.origin;
 };
 
@@ -60,7 +62,9 @@
 void(entity e) RegenFlag =
 {
 	setattachment(e, world, "");
-	e.movetype = self.movetype_orig;
+	e.movetype = MOVETYPE_NONE;
+	if(!self.noalign)
+		e.movetype = MOVETYPE_TOSS;
 	e.solid = SOLID_TRIGGER;
 	// TODO: play a sound here
 	setorigin(e, e.oldorigin);