Permalink
Browse files

Partial revert of a81b3cf

Broke the firing of eventAttacked
  • Loading branch information...
perim committed Nov 12, 2017
1 parent 561bbbc commit 37a2a307f0e82d69a1ee051bb97f4e32c195ebcc
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/combat.cpp
View
@@ -375,6 +375,7 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP
{
int level = 1;
int armour = objArmour(psObj, weaponClass);
const int lastHit = psObj->timeLastHit;
// If the previous hit was by an EMP cannon and this one is not:
// don't reset the weapon class and hit time
@@ -401,7 +402,7 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP
bMultiMessages = bMultiPlayer;
clustObjectAttacked((BASE_OBJECT *)psObj);
triggerEventAttacked(psObj, g_pProjLastAttacker, psObj->timeLastHit);
triggerEventAttacked(psObj, g_pProjLastAttacker, lastHit);
bMultiMessages = bMultiMessagesBackup;
}

0 comments on commit 37a2a30

Please sign in to comment.