Merge branch 'drjaska/handicap' into 'master'

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

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index ad3ba94e4a21d18c9aa7c293a1c68cfa9a04edeb..a9ae47eb1e6ddaddeca3dfcf83aaa7022ce4197f 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -127,6 +127,7 @@ void CopyBody(entity this, float keepvelocity)
 
        if(clone.colormap <= maxclients && clone.colormap > 0)
                clone.colormap = 1024 + this.clientcolors;
+       clone.sv_entnum = etof(this); // sent to CSQC for color mapping purposes
 
        CSQCMODEL_AUTOINIT(clone);
        clone.CopyBody_nextthink = this.nextthink;
@@ -237,10 +238,10 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
        {
                if(!DEATH_ISSPECIAL(deathtype))
                {
-                       damage *= Handicap_GetTotalHandicap(this);
+                       damage *= Handicap_GetTotalHandicap(this, true);
                        if (this != attacker && IS_PLAYER(attacker))
                        {
-                               damage /= Handicap_GetTotalHandicap(attacker);
+                               damage /= Handicap_GetTotalHandicap(attacker, false);
                        }
                }