From: Samual <samual@xonotic.org>
Date: Tue, 24 Jul 2012 07:35:05 +0000 (-0400)
Subject: Begin attempting to support warpzones
X-Git-Tag: xonotic-v0.8.0~152^2~408^2~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f80648360825be76e98227b9e11fb495fcf835d;p=xonotic%2Fxonotic-data.pk3dir.git

Begin attempting to support warpzones
---

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 39c1bcea3..843a86b05 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -7,9 +7,9 @@ void() W_LastWeapon;
 .float swing_prev;
 .entity swing_alreadyhit;
 
-void SendCSQCShockwaveParticle(float spread, vector endpos) 
+void SendCSQCShockwaveParticle(float spread, vector endpos, entity transform) 
 {
-	//WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+	WarpZone_UnTransformOrigin(transform, endpos);
 	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
 	WriteByte(MSG_BROADCAST, TE_CSQC_SHOCKWAVEPARTICLE);
 	WriteCoord(MSG_BROADCAST, w_shotorg_x);
@@ -127,7 +127,7 @@ void W_Laser_Shockwave()
 	RadiusDamageForSource(self, trace_endpos, '0 0 0', self, autocvar_g_balance_laser_primary_damage, autocvar_g_balance_laser_primary_edgedamage, autocvar_g_balance_laser_primary_jumpradius, world, self, TRUE, autocvar_g_balance_laser_primary_force, WEP_LASER, world);
 	
 	// also do the firing effect now
-	SendCSQCShockwaveParticle(autocvar_g_balance_laser_primary_spread, attack_hitpos);
+	SendCSQCShockwaveParticle(autocvar_g_balance_laser_primary_spread, attack_hitpos, transform);
 	
 	// did we hit a player directly?
 	if(aim_ent.takedamage)