X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fwarpzone%2Fserver.qc;h=780968375e4851bb661225060227104f0de362f2;hp=2805c005096582383c78f9464906ccecca337817;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=ec98f5c9d50f267779fed871c9eb094a52064219

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 2805c00509..780968375e 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -10,6 +10,7 @@
 	#include <common/util.qh>
 	#include <server/constants.qh>
 	#include <server/defs.qh>
+	#include <server/utils.qh>
 #endif
 
 #ifdef WARPZONELIB_KEEPDEBUG
@@ -28,12 +29,12 @@
 .float warpzone_teleport_finishtime;
 .entity warpzone_teleport_zone;
 
-#define WarpZone_StoreProjectileData(e_) MACRO_BEGIN { \
+#define WarpZone_StoreProjectileData(e_) MACRO_BEGIN \
 	entity e = e_; \
 	e.warpzone_oldorigin = e.origin; \
 	e.warpzone_oldvelocity = e.velocity; \
 	e.warpzone_oldangles = e.angles; \
-	} MACRO_END
+	MACRO_END
 
 void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity)
 {
@@ -42,11 +43,17 @@ void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector
 	player.lastteleporttime = time;
 #endif
 	setorigin(player, to); // NOTE: this also aborts the move, when this is called by touch
+	player.angles = to_angles;
 #ifdef SVQC
 	player.oldorigin = to; // for DP's unsticking
 	player.fixangle = true;
+	if (IS_BOT_CLIENT(player))
+	{
+		// FIXME find a way to smooth view's angles change for bots too
+		player.v_angle = player.angles;
+		bot_aim_reset(player);
+	}
 #endif
-	player.angles = to_angles;
 	player.velocity = to_velocity;
 
 	BITXOR_ASSIGN(player.effects, EF_TELEPORT_BIT);
@@ -595,15 +602,15 @@ void WarpZone_InitStep_UpdateTransform(entity this)
 		if(area > 0)
 		{
 			org = org - ((org - point) * norm) * norm; // project to plane
-			makevectors(ang);
-			if(norm * v_forward < 0)
+			MAKE_VECTORS_NEW(ang, forward, right, up);
+			if(norm * forward < 0)
 			{
 				LOG_INFO("Position target of trigger_warpzone near ", vtos(this.aiment.origin), " points into trigger_warpzone. BEWARE.");
 				norm = -1 * norm;
 			}
-			ang = vectoangles2(norm, v_up); // keep rotation, but turn exactly against plane
+			ang = vectoangles2(norm, up); // keep rotation, but turn exactly against plane
 			ang.x = -ang.x;
-			if(norm * v_forward < 0.99)
+			if(norm * forward < 0.99)
 				LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been turned to match plane orientation (", vtos(this.aiment.angles), " -> ", vtos(ang));
 			if(vdist(org - this.aiment.origin, >, 0.5))
 				LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been moved to match the plane (", vtos(this.aiment.origin), " -> ", vtos(org), ").");