]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
only silence the killindicator centerprint when it's actually triggered by hitting...
authorFruitieX <fruitiex@gmail.com>
Sat, 11 Dec 2010 20:29:17 +0000 (22:29 +0200)
committerFruitieX <fruitiex@gmail.com>
Sat, 11 Dec 2010 20:29:17 +0000 (22:29 +0200)
qcsrc/server/cl_client.qc

index fac1c0e57111079104c270b3f7201c0d2ae66694..ba6c2e5781486f7e037c3c21e0a0b7e2b0d5bbac 100644 (file)
@@ -1272,7 +1272,7 @@ void KillIndicator_Think()
                ClientKill_Now(); // no oldself needed
                return;
        }
-    else if(g_cts)
+    else if(g_cts && self.health == 1) // health == 1 means that it's silent
     {
         self.nextthink = time + 1;
         self.cnt -= 1;
@@ -1388,6 +1388,7 @@ void CTS_ClientKill (entity e) // silent version of ClientKill
     e.killindicator.think = KillIndicator_Think;
     e.killindicator.nextthink = time + (e.lip) * 0.05;
     e.killindicator.cnt = ceil(autocvar_g_cts_finish_kill_delay);
+    e.killindicator.health = 1; // this is used to indicate that it should be silent
     e.lip = 0;
 }