diff options
| author | archshift <admin@archshift.com> | 2014-04-23 00:59:31 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-23 00:59:31 +0200 |
| commit | a37b36adab85206e025d4ca97f6e64dc7a6974b8 (patch) | |
| tree | b265744c9892c7a624439aff2976e9fa618e39b3 | |
| parent | Fixed indentation and changed m_Fireproof to m_IsFireproof. (diff) | |
| download | cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar.gz cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar.bz2 cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar.lz cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar.xz cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.tar.zst cuberite-a37b36adab85206e025d4ca97f6e64dc7a6974b8.zip | |
| -rw-r--r-- | src/Entities/Entity.cpp | 11 | ||||
| -rw-r--r-- | src/Entities/Entity.h | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 9a80d3e80..82900ff91 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -45,6 +45,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_IsInitialized(false) , m_EntityType(a_EntityType) , m_World(NULL) + , m_IsFireproof(false) , m_TicksSinceLastBurnDamage(0) , m_TicksSinceLastLavaDamage(0) , m_TicksSinceLastFireDamage(0) @@ -1042,6 +1043,16 @@ void cEntity::SetMaxHealth(int a_MaxHealth) +/// Sets whether the entity is fireproof +void cEntity::SetFireproofStatus(bool a_IsFireproof) +{ + m_IsFireproof = a_IsFireproof; +} + + + + + /// Puts the entity on fire for the specified amount of ticks void cEntity::StartBurning(int a_TicksLeftBurning) { diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 84a2003d4..4267ed0f6 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -329,6 +329,11 @@ public: int GetMaxHealth(void) const { return m_MaxHealth; } + /// Sets whether the entity is fireproof + void SetFireproofStatus(bool a_IsFireproof); + + bool GetFireproofStatus(void) const { return m_IsFireproof; } + /// Puts the entity on fire for the specified amount of ticks void StartBurning(int a_TicksLeftBurning); |