Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7ff2f028f0faf330492b3f4dcb41546c72723495..af5cdb1315258d4a5c91301843778e5305b047e2 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -912,7 +912,7 @@ void KillIndicator_Think(entity this)
                ClientKill_Now(this.owner);
                return;
        }
                ClientKill_Now(this.owner);
                return;
        }

-    else if(g_cts && this.health == 1) // health == 1 means that it's silent
+    else if(this.health == 1) // health == 1 means that it's silent

     {
         this.nextthink = time + 1;
         this.cnt -= 1;
     {
         this.nextthink = time + 1;
         this.cnt -= 1;


@@ -942,11 +942,9 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
 
        killtime = autocvar_g_balance_kill_delay;
 
 
        killtime = autocvar_g_balance_kill_delay;
 

-       if(g_race_qualifying || g_cts)
-               killtime = 0;
-

     if(MUTATOR_CALLHOOK(ClientKill, this, killtime))
        return;
     if(MUTATOR_CALLHOOK(ClientKill, this, killtime))
        return;

+    killtime = M_ARGV(1, float);

 
        this.killindicator_teamchange = targetteam;
 
 
        this.killindicator_teamchange = targetteam;
 


@@ -1045,6 +1043,9 @@ void FixClientCvars(entity e)
        if(autocvar_sv_gentle)
                stuffcmd(e, "cl_cmd settemp cl_gentle 1\n");
 
        if(autocvar_sv_gentle)
                stuffcmd(e, "cl_cmd settemp cl_gentle 1\n");
 

+       stuffcmd(e, sprintf("\ncl_jumpspeedcap_min \"%s\"\n", autocvar_sv_jumpspeedcap_min));
+       stuffcmd(e, sprintf("\ncl_jumpspeedcap_max \"%s\"\n", autocvar_sv_jumpspeedcap_max));
+

        MUTATOR_CALLHOOK(FixClientCvars, e);
 }
 
        MUTATOR_CALLHOOK(FixClientCvars, e);
 }