flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Renamed getter and setter for IsFireproof.

Browse Source
This commit is contained in:
archshift 2014-04-23 00:12:37 -07:00
parent fe08a903fc
commit 8768669428
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Entity.cpp
View File

@ -1044,7 +1044,7 @@ void cEntity::SetMaxHealth(int a_MaxHealth)
/// Sets whether the entity is fireproof /// Sets whether the entity is fireproof
void cEntity::SetFireproofStatus(bool a_IsFireproof) void cEntity::SetIsFireproof(bool a_IsFireproof)
{ {
m_IsFireproof = a_IsFireproof; m_IsFireproof = a_IsFireproof;
} }

4
src/Entities/Entity.h
View File

@ -330,9 +330,9 @@ public:
int GetMaxHealth(void) const { return m_MaxHealth; } int GetMaxHealth(void) const { return m_MaxHealth; }
/// Sets whether the entity is fireproof /// 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 /// Puts the entity on fire for the specified amount of ticks
void StartBurning(int a_TicksLeftBurning); void StartBurning(int a_TicksLeftBurning);

2
src/MonsterConfig.cpp
View File

@ -94,7 +94,7 @@ void cMonsterConfig::AssignAttributes(cMonster * a_Monster, const AString & a_Na
a_Monster->SetSightDistance(itr->m_SightDistance); a_Monster->SetSightDistance(itr->m_SightDistance);
a_Monster->SetAttackRate ((float)itr->m_AttackRate); a_Monster->SetAttackRate ((float)itr->m_AttackRate);
a_Monster->SetMaxHealth (itr->m_MaxHealth); a_Monster->SetMaxHealth (itr->m_MaxHealth);
a_Monster->SetFireproofStatus(itr->m_IsFireproof); a_Monster->SetIsFireproof (itr->m_IsFireproof);
return; return;
} }
} // for itr - m_pState->AttributesList[] } // for itr - m_pState->AttributesList[]