Merge branch 'master' into Mario/use1

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / turret / walker.qc

diff --git a/qcsrc/common/turrets/turret/walker.qc b/qcsrc/common/turrets/turret/walker.qc
index 918ce4ca3a1bbc91c1c14de41af6595399379855..d99479cb180a7efcfb8419e73f7c6fd80bb2c35c 100644 (file)
--- a/qcsrc/common/turrets/turret/walker.qc
+++ b/qcsrc/common/turrets/turret/walker.qc
@@ -109,7 +109,7 @@ void walker_rocket_damage(entity this, entity inflictor, entity attacker, float
     this.velocity = this.velocity + vforce;
 
     if (this.health <= 0)
-        WITHSELF(this, W_PrepareExplosionByDamage(this.owner, walker_rocket_explode));
+        W_PrepareExplosionByDamage(this, this.owner, walker_rocket_explode);
 }
 
 #define WALKER_ROCKET_MOVE movelib_move_simple(self, newdir, (autocvar_g_turrets_unit_walker_rocket_speed), (autocvar_g_turrets_unit_walker_rocket_turnrate)); UpdateCSQCProjectile(self)
@@ -312,8 +312,8 @@ void walker_move_path()
 
             if (self.pathgoal)
             {
-                if (self.pathgoal.use)
-                    self.pathgoal.use();
+                if (self.pathgoal.use1)
+                    self.pathgoal.use1(self, NULL, NULL);
 
                 if (self.pathgoal.enemy)
                 {