2 files changed, 13 insertions, 15 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);
 
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index 05bc09e88..6a7035ee6 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -39,23 +39,17 @@ public:
 
 	// tolua_begin
 
-	/** Applies an entity effect
+	/** Applies an entity effect.
 	Checks with plugins if they allow the addition.
-	@param a_EffectType          The entity effect to apply
-	@param a_EffectDurationTicks The duration of the effect
-	@param a_EffectIntensity     The level of the effect (0 = Potion I, 1 = Potion II, etc)
-	@param a_DistanceModifier    The scalar multiplied to the potion duration, only applies to splash potions)
+	a_EffectIntensity is the level of the effect (0 = Potion I, 1 = Potion II, etc).
+	a_DistanceModifier is the scalar multiplied to the potion duration (only applies to splash potions).
 	*/
 	void AddEntityEffect(cEntityEffect::eType a_EffectType, int a_EffectDurationTicks, short a_EffectIntensity, double a_DistanceModifier = 1);
 
-	/** Removes a currently applied entity effect
-	@param a_EffectType The entity effect to remove
-	*/
+	/** Removes a currently applied entity effect. */
 	void RemoveEntityEffect(cEntityEffect::eType a_EffectType);
 
-	/** Returns true, if the entity effect is currently applied
-	@param a_EffectType The entity effect to check
-	*/
+	/** Returns true, if the entity effect is currently applied. */
 	bool HasEntityEffect(cEntityEffect::eType a_EffectType) const;
 
 	/** Removes all currently applied entity effects (used when drinking milk) */
@@ -63,7 +57,7 @@ public:
 
 	// tolua_end
 
-	/** remove the monster from the list of monsters targeting this pawn. */
+	/** Remove the monster from the list of monsters targeting this pawn. */
 	void NoLongerTargetingMe(cMonster * a_Monster);
 
 	/** Add the monster to the list of monsters targeting this pawn. (Does not check if already in list!) */