diff options
| author | Léo Lam <leo@leolam.fr> | 2026-10-15 19:12:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-15 19:12:41 +0100 |
| commit | e78c02499d0f108ae9c00158198289764c5980fe (patch) | |
| tree | f8346dfd0f52fcdc86d7d3fa3bee4b9b71ba6a5c /src/Game/Actor/Damage/actDamageManagerBase.cpp | |
| parent | deb3086555d9d1af240296323085628c770eab8c (diff) | |
| parent | 05236e5a38097b198950669b353b14f31adf4322 (diff) | |
Merge pull request #230 from leoetlino/stack/03e-actor-virtual-names
Name placeholder virtuals from their overrides
Diffstat (limited to 'src/Game/Actor/Damage/actDamageManagerBase.cpp')
| -rw-r--r-- | src/Game/Actor/Damage/actDamageManagerBase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Game/Actor/Damage/actDamageManagerBase.cpp b/src/Game/Actor/Damage/actDamageManagerBase.cpp index ab634ec4..11dd118d 100644 --- a/src/Game/Actor/Damage/actDamageManagerBase.cpp +++ b/src/Game/Actor/Damage/actDamageManagerBase.cpp @@ -140,7 +140,7 @@ void DamageManagerBase::preDelete1() { } bool DamageManagerBase::canTakeDamage() { - u32 damageTypeMaybe = m49(getField50()); + u32 damageTypeMaybe = getDamageFromTypeIndex(getField50()); if (!DamageInfoMgr::instance()) { return false; } @@ -188,7 +188,7 @@ bool DamageManagerBase::addDamage(s64, s32 damage, s32 df48, s32 minDmg, s32 f50 return true; } -s32 DamageManagerBase::m49(s32 damageTypeMaybe) { +s32 DamageManagerBase::getDamageFromTypeIndex(s32 damageTypeMaybe) { if (damageTypeMaybe == 3) { return 2; } |
