summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-11-10 21:55:32 +0100
committermadmaxoft <github@xoft.cz>2013-11-10 21:55:32 +0100
commitdadae874f20259e88d20e7ccbb34c8617e69bf40 (patch)
tree3e82f31efa8a6a2430ae2a461b740471d4e1ad08
parentMerge branch 'master' into WolfUpdate (diff)
downloadcuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar.gz
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar.bz2
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar.lz
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar.xz
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.tar.zst
cuberite-dadae874f20259e88d20e7ccbb34c8617e69bf40.zip
Diffstat (limited to '')
-rw-r--r--source/Mobs/Wolf.cpp27
-rw-r--r--source/Mobs/Wolf.h27
2 files changed, 32 insertions, 22 deletions
diff --git a/source/Mobs/Wolf.cpp b/source/Mobs/Wolf.cpp
index ac094e870..02052e374 100644
--- a/source/Mobs/Wolf.cpp
+++ b/source/Mobs/Wolf.cpp
@@ -17,7 +17,7 @@ cWolf::cWolf(void) :
m_IsSitting(false),
m_IsBegging(false),
m_Owner(""),
- m_Collar(14)
+ m_CollarColor(14)
{
}
@@ -41,7 +41,7 @@ void cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
void cWolf::OnRightClicked(cPlayer & a_Player)
{
- if ((!IsTame()) && (!IsAngry()))
+ if (!IsTame() && !IsAngry())
{
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_BONE)
{
@@ -69,7 +69,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
{
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
{
- m_Collar = 15 - a_Player.GetEquippedItem().m_ItemDamage;
+ m_CollarColor = 15 - a_Player.GetEquippedItem().m_ItemDamage;
if (!a_Player.IsGameModeCreative())
{
a_Player.GetInventory().RemoveOneEquippedItem();
@@ -98,7 +98,9 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
if (!IsAngry())
{
cMonster::Tick(a_Dt, a_Chunk);
- } else {
+ }
+ else
+ {
super::Tick(a_Dt, a_Chunk);
}
@@ -151,8 +153,7 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
}
public:
Vector3f OwnerCoords;
- } ;
- cCallback Callback;
+ } Callback;
m_World->DoWithPlayer(m_Owner, Callback);
Vector3f OwnerCoords = Callback.OwnerCoords;
@@ -164,11 +165,19 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
if (Distance < 3)
{
m_bMovingToDestination = false;
- } else if((Distance > 30) && (!IsSitting())) {
+ }
+ else if ((Distance > 30) && (!IsSitting()))
+ {
TeleportToCoords(OwnerCoords.x, OwnerCoords.y, OwnerCoords.z);
- } else {
+ }
+ else
+ {
m_Destination = OwnerCoords;
}
}
}
-} \ No newline at end of file
+}
+
+
+
+
diff --git a/source/Mobs/Wolf.h b/source/Mobs/Wolf.h
index bc26fbf9b..d51d4e78a 100644
--- a/source/Mobs/Wolf.h
+++ b/source/Mobs/Wolf.h
@@ -23,28 +23,29 @@ public:
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
// Get functions
- 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; }
+ 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_CollarColor; }
// Set functions
- 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; }
+ 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; }
+ void SetCollarColor(int a_CollarColor) { m_CollarColor = a_CollarColor; }
-private:
+protected:
bool m_IsSitting;
bool m_IsTame;
bool m_IsBegging;
bool m_IsAngry;
AString m_Owner;
- int m_Collar;
+ int m_CollarColor;
} ;