Merge branch 'master' into Mario/gameover_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / blaster.qc

diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc
index ca305f7ba7c4191914f81c8a65ae33c9dc68286d..79a680e367eb27825d3d3a9befabbc99824c4edb 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@ -56,9 +56,9 @@ REGISTER_WEAPON(BLASTER, blaster, NEW(Blaster));
 spawnfunc(weapon_blaster) { weapon_defaultspawnfunc(this, WEP_BLASTER); }
 spawnfunc(weapon_laser) { spawnfunc_weapon_blaster(this); }
 
-void W_Blaster_Touch(entity this)
+void W_Blaster_Touch(entity this, entity toucher)
 {
-       PROJECTILE_TOUCH(this);
+       PROJECTILE_TOUCH(this, toucher);
 
        this.event_damage = func_null;
 
@@ -68,11 +68,11 @@ void W_Blaster_Touch(entity this)
                this.blaster_damage,
                this.blaster_edgedamage,
                this.blaster_radius,
-               world,
-               world,
+               NULL,
+               NULL,
                this.blaster_force,
                this.projectiledeathtype,
-               other
+               toucher
        );
 
        remove(this);