Merge branch 'terencehill/fuelregen_powerup' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / weapons / projectile.qc

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index c57a5aeaf3b6545d71f1ff2ca7a4b938cb9c7a28..c8e246a06e3dd6a0ab79170802846d19538c37e0 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -22,7 +22,11 @@ void SUB_Stop(entity this)
        this.move_movetype = MOVETYPE_NONE;
 }
 
-void SUB_Stop_self() { SUB_Stop(self); }
+void SUB_Stop_self()
+{
+       SELFPARAM();
+       SUB_Stop(this);
+}
 
 void Projectile_ResetTrail(entity this, vector to)
 {
@@ -252,7 +256,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
                {
                        this.trail_oldorigin = this.origin;
                        if (!(this.count & 0x80))
-                               WITH(entity, self, this, InterpolateOrigin_Reset());
+                               InterpolateOrigin_Reset(this);
                }
 
                if (f & 0x20)
@@ -290,6 +294,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew)
                        HANDLE(GRENADE_BOUNCING)   this.traileffect = EFFECT_TR_GRENADE.m_id; break;
                        HANDLE(MINE)               this.traileffect = EFFECT_TR_GRENADE.m_id; break;
                        HANDLE(BLASTER)            this.traileffect = EFFECT_Null.m_id; break;
+                       HANDLE(ARC_BOLT)           this.traileffect = EFFECT_Null.m_id; break;
                        HANDLE(HLAC)               this.traileffect = EFFECT_Null.m_id; break;
                        HANDLE(PORTO_RED)          this.traileffect = EFFECT_TR_WIZSPIKE.m_id; this.scale = 4; break;
                        HANDLE(PORTO_BLUE)         this.traileffect = EFFECT_TR_WIZSPIKE.m_id; this.scale = 4; break;