summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/Mobs/Wolf.cpp24
-rw-r--r--source/Mobs/Wolf.h34
2 files changed, 29 insertions, 29 deletions
diff --git a/source/Mobs/Wolf.cpp b/source/Mobs/Wolf.cpp
index 9880a3442..ac094e870 100644
--- a/source/Mobs/Wolf.cpp
+++ b/source/Mobs/Wolf.cpp
@@ -12,12 +12,12 @@
cWolf::cWolf(void) :
super("Wolf", mtWolf, "mob.wolf.hurt", "mob.wolf.death", 0.6, 0.8),
- m_bIsAngry(false),
- m_bIsTame(false),
- m_bIsSitting(false),
- m_bIsBegging(false),
- m_bOwner(""),
- m_bCollar(14)
+ m_IsAngry(false),
+ m_IsTame(false),
+ m_IsSitting(false),
+ m_IsBegging(false),
+ m_Owner(""),
+ m_Collar(14)
{
}
@@ -28,9 +28,9 @@ cWolf::cWolf(void) :
void cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
{
super::DoTakeDamage(a_TDI);
- if (!m_bIsTame)
+ if (!m_IsTame)
{
- m_bIsAngry = true;
+ m_IsAngry = true;
}
m_World->BroadcastEntityMetadata(*this); // Broadcast health and possibly angry face
}
@@ -65,11 +65,11 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
}
else if (IsTame())
{
- if (a_Player.GetName() == m_bOwner) // Is the player the owner of the dog?
+ if (a_Player.GetName() == m_Owner) // Is the player the owner of the dog?
{
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
{
- m_bCollar = 15 - a_Player.GetEquippedItem().m_ItemDamage;
+ m_Collar = 15 - a_Player.GetEquippedItem().m_ItemDamage;
if (!a_Player.IsGameModeCreative())
{
a_Player.GetInventory().RemoveOneEquippedItem();
@@ -153,12 +153,12 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
Vector3f OwnerCoords;
} ;
cCallback Callback;
- m_World->DoWithPlayer(m_bOwner, Callback);
+ m_World->DoWithPlayer(m_Owner, Callback);
Vector3f OwnerCoords = Callback.OwnerCoords;
if (IsTame())
{
- if (m_bOwner != "")
+ if (m_Owner != "")
{
double Distance = (OwnerCoords - GetPosition()).Length();
if (Distance < 3)
diff --git a/source/Mobs/Wolf.h b/source/Mobs/Wolf.h
index 2afca8086..bc26fbf9b 100644
--- a/source/Mobs/Wolf.h
+++ b/source/Mobs/Wolf.h
@@ -23,28 +23,28 @@ public:
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
// Get functions
- bool IsSitting(void) const { return m_bIsSitting; }
- bool IsTame(void) const { return m_bIsTame; }
- bool IsBegging(void) const { return m_bIsBegging; }
- bool IsAngry(void) const { return m_bIsAngry; }
- AString GetOwner(void) const { return m_bOwner; }
- int GetCollarColor(void) const { return m_bCollar; }
+ bool IsSitting(void) const { return m_IsSitting; }
+ bool IsTame(void) const { return m_IsTame; }
+ bool IsBegging(void) const { return m_IsBegging; }
+ bool IsAngry(void) const { return m_IsAngry; }
+ AString GetOwner(void) const { return m_Owner; }
+ int GetCollarColor(void) const { return m_Collar; }
// Set functions
- void SetIsSitting(bool a_IsSitting) { m_bIsSitting = a_IsSitting; }
- void SetIsTame(bool a_IsTame) { m_bIsTame = a_IsTame; }
- void SetIsBegging(bool a_IsBegging) { m_bIsBegging = a_IsBegging; }
- void SetIsAngry(bool a_IsAngry) { m_bIsAngry = a_IsAngry; }
- void SetOwner(AString a_NewOwner) { m_bOwner = a_NewOwner; }
+ void SetIsSitting(bool a_IsSitting) { m_IsSitting = a_IsSitting; }
+ void SetIsTame(bool a_IsTame) { m_IsTame = a_IsTame; }
+ void SetIsBegging(bool a_IsBegging) { m_IsBegging = a_IsBegging; }
+ void SetIsAngry(bool a_IsAngry) { m_IsAngry = a_IsAngry; }
+ void SetOwner(AString a_NewOwner) { m_Owner = a_NewOwner; }
private:
- bool m_bIsSitting;
- bool m_bIsTame;
- bool m_bIsBegging;
- bool m_bIsAngry;
- AString m_bOwner;
- int m_bCollar;
+ bool m_IsSitting;
+ bool m_IsTame;
+ bool m_IsBegging;
+ bool m_IsAngry;
+ AString m_Owner;
+ int m_Collar;
} ;