summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-07-06 12:39:56 +0200
committerMattes D <github@xoft.cz>2016-07-18 22:11:40 +0200
commitf8e1df2476074a86e4dc25204c2250a6111245de (patch)
tree863ea680019654b87a86b98f26854d90ad53826e /src/Entities/Entity.h
parentVector3: Removed useless NormalizeCopy overload from LuaAPI. (diff)
downloadcuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar.gz
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar.bz2
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar.lz
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar.xz
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.tar.zst
cuberite-f8e1df2476074a86e4dc25204c2250a6111245de.zip
Diffstat (limited to 'src/Entities/Entity.h')
-rw-r--r--src/Entities/Entity.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 6923795db..c543fd9c1 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -305,7 +305,7 @@ public:
/** Returns the hitpoints that this pawn can deal to a_Receiver using its equipped items */
virtual int GetRawDamageAgainst(const cEntity & a_Receiver);
- /** Returns whether armor will protect against the passed damage type */
+ /** Returns whether armor will protect against the specified damage type */
virtual bool ArmorCoversAgainst(eDamageType a_DamageType);
/** Returns the hitpoints out of a_RawDamage that the currently equipped armor would cover */
@@ -329,9 +329,13 @@ public:
/** Returns the currently equipped boots; empty item if none */
virtual cItem GetEquippedBoots(void) const { return cItem(); }
- /** Called when the health drops below zero. a_Killer may be nullptr (environmental damage) */
+ // tolua_end
+
+ /** Called when the health drops below zero. a_TDI's Attacker may be nullptr (environmental damage) */
virtual void KilledBy(TakeDamageInfo & a_TDI);
+ // tolua_begin
+
/** Called when the entity kills another entity */
virtual void Killed(cEntity * a_Victim) {}
@@ -404,7 +408,7 @@ public:
virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ);
/** Schedules a MoveToWorld call to occur on the next Tick of the entity */
- void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_SetPortalCooldown = false);
+ void ScheduleMoveToWorld(cWorld * a_World, Vector3d a_NewPosition, bool a_ShouldSetPortalCooldown = false);
bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition);