Adds parameters to OnDamage to show the health change.
continuous-integration/drone/push Build is passing

This commit is contained in:
Deukhoofd committed 2021-11-21 14:13:31 +01:00
1 parent 0912483ba8
commit 9cb2a27007
2 files changed
+3 -4

No files matched your search

+1 -3
View File
@@ -210,11 +210,9 @@ namespace CreatureLib::Battling {
if (battle.HasValue()) {
battle.GetValue()->TriggerEventListener<DamageEvent>(this, source, _currentHealth, newHealth);
battle.GetValue()->RegisterHistoryElement<DamageHistory>(this, damage, source);
HOOK(OnDamage, this, this, source, _currentHealth, newHealth);
}
_currentHealth = newHealth;
if (battle.HasValue()) {
HOOK(OnDamage, this, this, source);
}
if (IsFainted() && damage > 0 && battle != nullptr) {
OnFaint(source);
+2 -1
View File
@@ -114,7 +114,8 @@ namespace CreatureLib::Battling {
[[maybe_unused]] bool* result){};
virtual void OnEndTurn(){};
virtual void OnDamage(Creature*, DamageSource){};
virtual void OnDamage(Creature*, DamageSource, [[maybe_unused]] u32 oldHealth,
[[maybe_unused]] u32 newHealth){};
virtual void OnFaint(Creature*, DamageSource){};
virtual void OnSwitchIn(Creature*){};
};