diff options
author | archshift <admin@archshift.com> | 2014-04-23 09:12:37 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-04-23 09:12:37 +0200 |
commit | 876866942807f823d5d7553538f562a6b081093b (patch) | |
tree | bd6977353876ebe72c785f6c59d00e1839cd5f17 | |
parent | Declaration that a mob is not fireproof is implicit. (diff) | |
download | cuberite-876866942807f823d5d7553538f562a6b081093b.tar cuberite-876866942807f823d5d7553538f562a6b081093b.tar.gz cuberite-876866942807f823d5d7553538f562a6b081093b.tar.bz2 cuberite-876866942807f823d5d7553538f562a6b081093b.tar.lz cuberite-876866942807f823d5d7553538f562a6b081093b.tar.xz cuberite-876866942807f823d5d7553538f562a6b081093b.tar.zst cuberite-876866942807f823d5d7553538f562a6b081093b.zip |
-rw-r--r-- | src/Entities/Entity.cpp | 2 | ||||
-rw-r--r-- | src/Entities/Entity.h | 4 | ||||
-rw-r--r-- | src/MonsterConfig.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 82900ff91..6da6da54e 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1044,7 +1044,7 @@ void cEntity::SetMaxHealth(int a_MaxHealth) /// Sets whether the entity is fireproof -void cEntity::SetFireproofStatus(bool a_IsFireproof) +void cEntity::SetIsFireproof(bool a_IsFireproof) { m_IsFireproof = a_IsFireproof; } diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 4267ed0f6..86efc5a98 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -330,9 +330,9 @@ public: int GetMaxHealth(void) const { return m_MaxHealth; } /// Sets whether the entity is fireproof - void SetFireproofStatus(bool a_IsFireproof); + void SetIsFireproof(bool a_IsFireproof); - bool GetFireproofStatus(void) const { return m_IsFireproof; } + bool IsFireproof(void) const { return m_IsFireproof; } /// Puts the entity on fire for the specified amount of ticks void StartBurning(int a_TicksLeftBurning); diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp index 4b0e4bce1..72a3a3245 100644 --- a/src/MonsterConfig.cpp +++ b/src/MonsterConfig.cpp @@ -94,7 +94,7 @@ void cMonsterConfig::AssignAttributes(cMonster * a_Monster, const AString & a_Na a_Monster->SetSightDistance(itr->m_SightDistance); a_Monster->SetAttackRate ((float)itr->m_AttackRate); a_Monster->SetMaxHealth (itr->m_MaxHealth); - a_Monster->SetFireproofStatus(itr->m_IsFireproof); + a_Monster->SetIsFireproof (itr->m_IsFireproof); return; } } // for itr - m_pState->AttributesList[] |