This commit is contained in:
ineedbots 2021-07-07 14:22:44 -06:00
parent d00e230c58
commit b7053cba21

View File

@ -1592,7 +1592,7 @@ Callback_PlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, s
} }
doPrintDamage(dmg, hitloc) doPrintDamage(dmg, hitloc, flags)
{ {
huddamage = newclienthudelem(self); huddamage = newclienthudelem(self);
huddamage.alignx = "center"; huddamage.alignx = "center";
@ -1603,6 +1603,9 @@ doPrintDamage(dmg, hitloc)
huddamage.font = "objective"; huddamage.font = "objective";
huddamage setvalue(dmg); huddamage setvalue(dmg);
if ((flags & level.iDFLAGS_PENETRATION) != 0)
huddamage.color = (1, 0.25, 1);
if (hitloc == "head") if (hitloc == "head")
huddamage.color = (1, 1, 0.25); huddamage.color = (1, 1, 0.25);
@ -1628,9 +1631,9 @@ finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeat
if( level.allowPrintDamage ) if( level.allowPrintDamage )
{ {
if ( isDefined( eAttacker ) && isPlayer( eAttacker ) && eAttacker.printDamage ) if ( isDefined( eAttacker ) && isPlayer( eAttacker ) && eAttacker.printDamage )
eAttacker thread doPrintDamage(iDamage, sHitLoc); eAttacker thread doPrintDamage(iDamage, sHitLoc, iDFlags);
else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage ) else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage )
eAttacker.owner thread doPrintDamage(iDamage, sHitLoc); eAttacker.owner thread doPrintDamage(iDamage, sHitLoc, iDFlags);
} }
if( level.extraDamageFeedback ) if( level.extraDamageFeedback )