From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 26 Jun 2011 10:28:10 +0000 (+0200)
Subject: make CheckProjectileImpact more consistent
X-Git-Tag: xonotic-v0.5.0~159^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6925147571e9967f670ac7b54d9d670c5c61ffdf;p=xonotic%2Fxonotic-data.pk3dir.git

make CheckProjectileImpact more consistent
---

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 7d1780b0f..192bf830a 100644
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -264,6 +264,8 @@ float WarpZone_Camera_Send(entity to, float sendflags)
 
 float WarpZone_CheckProjectileImpact()
 {
+	// FIXME make this use WarpZone_Teleport
+
 	// if self hit a warpzone, abort
 	vector o0, v0, a0;
 	float mpd, pd, dpd;
@@ -305,9 +307,15 @@ float WarpZone_CheckProjectileImpact()
 			return 0;
 		}
 	}
+
 	WarpZone_RefSys_Add(self, wz);
+
+	BITXOR_ASSIGN(self.effects, EF_TELEPORT_BIT);
+	WarpZone_PostTeleportPlayer_Callback(self);
+
 	WarpZone_StoreProjectileData(self);
 	self.warpzone_teleport_time = time;
+	self.warpzone_teleport_zone = wz;
 
 	return +1;
 }