From: Mario <mario@smbclan.net>
Date: Fri, 22 Jul 2016 17:38:58 +0000 (+1000)
Subject: Cleanup the warpzone fix to support .move_movetype
X-Git-Tag: xonotic-v0.8.2~700^2~39^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14d7edaa4cffca5d48fe80cccf5c251b8f4f1ea5;p=xonotic%2Fxonotic-data.pk3dir.git

Cleanup the warpzone fix to support .move_movetype
---

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 03a25ab0b..668d7b9fc 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -664,12 +664,9 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy)  // SV_Ph
 			return;
 	}
 
-
 	if(dt > 0 && this.move_movetype != MOVETYPE_NONE && !IS_ONGROUND(this))
 	{
 		// now continue the move from move_time to time
-
-
 		if(this.move_didgravity > 0)
 		{
 			this.velocity_z -= (GAMEPLAYFIX_GRAVITYUNAFFECTEDBYTICRATE ? 0.5 : 1)
@@ -696,7 +693,6 @@ void Movetype_Physics_MatchTicrate(entity this, float tr, bool sloppy)  // SV_Ph
 	}
 	else
 	{
-
 		setorigin(this, this.origin);
 	}
 }
diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 974145e14..4390df809 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -175,10 +175,7 @@ void WarpZone_Touch(entity this, entity toucher)
 		return;
 
 	// FIXME needs a better check to know what is safe to teleport and what not
-	if(toucher.movetype == MOVETYPE_NONE || toucher.movetype == MOVETYPE_FOLLOW || toucher.tag_entity
-#if 0
-	|| toucher.move_movetype == MOVETYPE_NONE || toucher.move_movetype == MOVETYPE_FOLLOW
-#endif
+	if((toucher.movetype == MOVETYPE_NONE && toucher.move_movetype == MOVETYPE_NONE) || toucher.movetype == MOVETYPE_FOLLOW || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.tag_entity
 #ifdef CSQC
 	|| tag_networkentity
 #endif