From: Mario <mario@smbclan.net>
Date: Fri, 22 Jul 2016 16:37:25 +0000 (+1000)
Subject: Fix compile
X-Git-Tag: xonotic-v0.8.2~700^2~39^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f443af03f4f1d2905692996aab01dec7229651f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compile
---

diff --git a/qcsrc/common/physics/movetypes/movetypes.qh b/qcsrc/common/physics/movetypes/movetypes.qh
index 4459bbf59..8b061e383 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qh
+++ b/qcsrc/common/physics/movetypes/movetypes.qh
@@ -5,10 +5,10 @@
 #define SET_ONGROUND(s)                     ((s).flags |= FL_ONGROUND)
 #define UNSET_ONGROUND(s)                   ((s).flags &= ~FL_ONGROUND)
 
-.float move_ltime;
-.void(entity this) move_think;
-.float move_nextthink;
-.void(entity this, entity blocker) move_blocked;
+#ifdef CSQC
+.float bouncestop;
+.float bouncefactor;
+#endif
 
 .float move_movetype;
 .float move_time;
diff --git a/qcsrc/common/triggers/func/train.qc b/qcsrc/common/triggers/func/train.qc
index 85dc5b29a..d9e1799fb 100644
--- a/qcsrc/common/triggers/func/train.qc
+++ b/qcsrc/common/triggers/func/train.qc
@@ -322,8 +322,6 @@ NET_HANDLE(ENT_CLIENT_TRAIN, bool isnew)
 		//func_train_find();
 
 		// but we will need these
-		//this.move_nextthink = this.move_ltime + 0.1;
-		//this.move_think = train_next;
 		train_next(this);
 
 		this.move_movetype = MOVETYPE_PUSH;
diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/triggers/platforms.qc
index c1f481f8a..324fd3676 100644
--- a/qcsrc/common/triggers/platforms.qc
+++ b/qcsrc/common/triggers/platforms.qc
@@ -128,13 +128,8 @@ void plat_outside_touch(entity this, entity toucher)
 
 void plat_trigger_use(entity this, entity actor, entity trigger)
 {
-#ifdef SVQC
 	if (getthink(this))
 		return;		// already activated
-#elif defined(CSQC)
-	if(this.move_think)
-		return;
-#endif
 	plat_go_down(this);
 }
 
diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 594bd48e1..5262ca6de 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -40,9 +40,9 @@ void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector
 	setorigin(player, to); // NOTE: this also aborts the move, when this is called by touch
 #ifdef SVQC
 	player.oldorigin = to; // for DP's unsticking
+	player.fixangle = true;
 #endif
 	player.angles = to_angles;
-	player.fixangle = true;
 	player.velocity = to_velocity;
 
 	BITXOR_ASSIGN(player.effects, EF_TELEPORT_BIT);