Merge branch 'martin-t/units' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / all.qc

diff --git a/qcsrc/common/effects/all.qc b/qcsrc/common/effects/all.qc
index 73f1fe65fb4f150da0a5d4108e101535339e9a4c..af41054e31c1c40c462ce041a2cc540fa1c570be 100644 (file)
--- a/qcsrc/common/effects/all.qc
+++ b/qcsrc/common/effects/all.qc
@@ -28,7 +28,7 @@ NET_HANDLE(net_effect, bool isNew)
                eff_cnt = ReadByte();
 
        if(eff_trail)
-               WarpZone_TrailParticles(world, particleeffectnum(eff), v, vel);
+               WarpZone_TrailParticles(NULL, particleeffectnum(eff), v, vel);
        else
                pointparticles(eff, v, vel, eff_cnt);
        return true;
@@ -76,7 +76,7 @@ void Send_Effect(entity eff, vector eff_loc, vector eff_vel, int eff_cnt)
        net_eff.eent_eff_trail = eff.eent_eff_trail;
 
        FOREACH_CLIENT(IS_REAL_CLIENT(it), Net_Write_Effect(net_eff, it, 0));
-       remove(net_eff);
+       delete(net_eff);
 }
 
 void Send_Effect_(string eff_name, vector eff_loc, vector eff_vel, int eff_cnt)
@@ -91,4 +91,6 @@ void Send_Effect_(string eff_name, vector eff_loc, vector eff_vel, int eff_cnt)
 }
 #endif
 
-#include "effectinfo.qc"
+#if ENABLE_EFFECTINFO
+       #include "effectinfo.qc"
+#endif