summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-04-26 16:44:15 +0200
committerHowaner <franzi.moos@googlemail.com>2014-04-26 16:44:15 +0200
commit49f6819829b437f776ea08f50c92cc506ee9ddcb (patch)
tree34c7018d226f2fc29e9eea604a043554abd43a39 /src/Entities
parentChange m_InvulnerableTicks description again again :D (diff)
downloadcuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar.gz
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar.bz2
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar.lz
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar.xz
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.tar.zst
cuberite-49f6819829b437f776ea08f50c92cc506ee9ddcb.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Entity.h23
2 files changed, 14 insertions, 11 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 0af4eafde..db657909c 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -60,7 +60,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_Mass (0.001) // Default 1g
, m_Width(a_Width)
, m_Height(a_Height)
- , m_InvulnerableTicks(20)
+ , m_InvulnerableTicks(0)
{
cCSLock Lock(m_CSCount);
m_EntityCount++;
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index e76279c28..26edf8dca 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -262,7 +262,9 @@ public:
// tolua_end
- /** Makes this entity take damage specified in the a_TDI. The TDI is sent through plugins first, then applied. If it returns false, the entity hasn't become any damage. */
+ /** Makes this entity take damage specified in the a_TDI.
+ The TDI is sent through plugins first, then applied.
+ If it returns false, the entity hasn't receive any damage. */
virtual bool DoTakeDamage(TakeDamageInfo & a_TDI);
// tolua_begin
@@ -481,31 +483,32 @@ protected:
int m_AirTickTimer;
private:
- // Measured in degrees, [-180, +180)
+ /** Measured in degrees, [-180, +180) */
double m_HeadYaw;
- // Measured in meter/second (m/s)
+ /** Measured in meter/second (m/s) */
Vector3d m_Speed;
- // Measured in degrees, [-180, +180)
+ /** Measured in degrees, [-180, +180) */
Vector3d m_Rot;
- /// Position of the entity's XZ center and Y bottom
+ /** Position of the entity's XZ center and Y bottom */
Vector3d m_Pos;
- // Measured in meter / second
+ /** Measured in meter / second */
Vector3d m_WaterSpeed;
- // Measured in Kilograms (Kg)
+ /** Measured in Kilograms (Kg) */
double m_Mass;
- // Width of the entity, in the XZ plane. Since entities are represented as cylinders, this is more of a diameter.
+ /** Width of the entity, in the XZ plane. Since entities are represented as cylinders, this is more of a diameter. */
double m_Width;
- // Height of the entity (Y axis)
+ /** Height of the entity (Y axis) */
double m_Height;
- // If a player hit a entity, the entity become a invulnerable of 10 ticks. While this ticks, a player can't hit this entity.
+ /** If a player hit a entity, the entity receive a invulnerable of 10 ticks.
+ While this ticks, a player can't hit this entity. */
int m_InvulnerableTicks;
} ; // tolua_export