Add attacker parameter to PlayHitsound

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / spawn_near_teammate / spawn_near_teammate.qc

diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
index c53e9d1448d540f6d26226b91251c58fc9aa0a69..20f07e9e4eac53bd5957a98f7ed77aa2f27cf271 100644 (file)
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
@@ -25,7 +25,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, Spawn_Score)
        if(autocvar_g_spawn_near_teammate_ignore_spawnpoint == 1 || (autocvar_g_spawn_near_teammate_ignore_spawnpoint == 2 && player.cvar_cl_spawn_near_teammate))
                return;
 
-       spawn_spot.msnt_lookat = world;
+       spawn_spot.msnt_lookat = NULL;
 
        if(!teamplay)
                return;
@@ -79,7 +79,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
                if(autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death)
                        player.msnt_timer = time + autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
 
-               entity best_mate = world;
+               entity best_mate = NULL;
                vector best_spot = '0 0 0';
                float pc = 0, best_dist = 0, dist = 0;
                FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
@@ -88,6 +88,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
                        if(it.msnt_timer < time)
                        if(SAME_TEAM(player, it))
                        if(time > it.spawnshieldtime) // spawn shielding
+                       if(!forbidWeaponUse(it))
                        if(STAT(FROZEN, it) == 0)
                        if(it != player)
                        {