Merge remote-tracking branch 'origin/master' into unmash-bananas

This commit is contained in:
AJ Martinez 2024-08-24 04:10:04 -07:00
commit abd0920b06

View file

@ -4016,9 +4016,6 @@ boolean K_PvPAmpReward(UINT32 award, player_t *attacker, player_t *defender)
UINT32 atkdist = attacker->distancetofinish + epsilon; UINT32 atkdist = attacker->distancetofinish + epsilon;
UINT32 defdist = defender->distancetofinish; UINT32 defdist = defender->distancetofinish;
if (!attacker->bot)
CONS_Printf("%d - %d - ", atkdist, defdist);
if (atkdist > defdist) if (atkdist > defdist)
{ {
// Full reward for an active, even fight. // Full reward for an active, even fight.
@ -4030,8 +4027,6 @@ boolean K_PvPAmpReward(UINT32 award, player_t *attacker, player_t *defender)
award -= (delta * award / range / 2); award -= (delta * award / range / 2);
} }
if (!attacker->bot)
CONS_Printf("%d\n", award);
return award; return award;
} }