Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_laser.qc

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index e9ce3cdfb46b18ba8bf9c537e4f02dc4edc7ee9f..cb80b3a8e50856caaf51102b70a30dd3f14fe203 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -76,7 +76,7 @@ void W_Laser_Shockwave (void)
                        center = aim_ent.origin + (aim_ent.mins + aim_ent.maxs) * 0.5;
 
                final_force = (normalize(center - attack_hitpos) * autocvar_g_balance_laser_primary_force);
-               Damage(aim_ent, self, self, autocvar_g_balance_laser_primary_damage, WEP_LASER, w_shotorg, final_force);
+               Damage(aim_ent, self, self, autocvar_g_balance_laser_primary_damage, WEP_LASER, aim_ent.origin, final_force);
                print("Player hit directly via aim!\n");
        }
 
@@ -197,6 +197,7 @@ void W_Laser_Attack (float issecondary)
        missile.touch = W_Laser_Touch;
 
        missile.flags = FL_PROJECTILE;
+       missile.missile_flags = MIF_SPLASH; 
 
        missile.think = W_Laser_Think;
        missile.nextthink = time + autocvar_g_balance_laser_primary_delay;