experimental change: sort impulse weapon order by weapon priority too

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

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index fd7f3dd8a90e016554f017a098795dec285f79bf..955c0a45d2e0660d002343905515cf34f67b6647 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1305,7 +1305,12 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto
 
 void ClientKill (void)
 {
-       ClientKill_TeamChange(0);
+       if((g_arena || g_ca) && ((champion && champion.classname == "player" && player_count > 1) || player_count == 1)) // don't allow a kill in this case either
+       {
+               // do nothing
+       }
+       else
+               ClientKill_TeamChange(0);
 }
 
 void DoTeamChange(float destteam)
@@ -1668,9 +1673,6 @@ void ClientDisconnect (void)
        if (self.killindicator)
                remove (self.killindicator);
 
-       if (self.muzzleflash)
-               remove (self.muzzleflash);
-
        WaypointSprite_PlayerGone();
 
        bot_relinkplayerlist();
@@ -1693,6 +1695,8 @@ void ClientDisconnect (void)
                strunzone(self.netname_previous);
        if(self.clientstatus)
                strunzone(self.clientstatus);
+       if(self.weaponorder_byimpulse)
+               strunzone(self.weaponorder_byimpulse);
 
        ClearPlayerSounds();