]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Begin attempting to support warpzones
authorSamual <samual@xonotic.org>
Tue, 24 Jul 2012 07:35:05 +0000 (03:35 -0400)
committerSamual <samual@xonotic.org>
Tue, 24 Jul 2012 07:35:05 +0000 (03:35 -0400)
qcsrc/server/w_laser.qc

index 39c1bcea31cf66ee180645b781b0b4927d8917a8..843a86b05def0af04e97d9bcc70bd5b52a90635f 100644 (file)
@@ -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)