diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-22 20:52:49 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-22 20:52:49 +0100 |
| commit | 7ba432b338ffa4c448de9d68d0f1b1e0024cd50a (patch) | |
| tree | 706035da78a49c971f6d3bf3d812582581ce93a4 /src/Entities/Entity.h | |
| parent | Merge pull request #2894 from LogicParrot/spider (diff) | |
| parent | Improved tamed wolf pack cooperation and projectile reactions (diff) | |
| download | cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar.gz cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar.bz2 cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar.lz cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar.xz cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.tar.zst cuberite-7ba432b338ffa4c448de9d68d0f1b1e0024cd50a.zip | |
Diffstat (limited to 'src/Entities/Entity.h')
| -rw-r--r-- | src/Entities/Entity.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index fdc5437b3..3715fb5c4 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -263,6 +263,9 @@ public: /** Makes this entity take the specified damage. The final damage is calculated using current armor, then DoTakeDamage() called */ void TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, double a_KnockbackAmount); + /** Makes this entity take the specified damage. The final damage is calculated using current armor, then DoTakeDamage() called */ + void TakeDamage(eDamageType a_DamageType, UInt32 a_Attacker, int a_RawDamage, double a_KnockbackAmount); + /** Makes this entity take the specified damage. The values are packed into a TDI, knockback calculated, then sent through DoTakeDamage() */ void TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, int a_FinalDamage, double a_KnockbackAmount); |