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

Merge remote-tracking branch 'origin/WolfUpdate'

Browse Source 
Conflicts:
	source/Mobs/Wolf.h
This commit is contained in:
madmaxoft 2013-11-13 22:38:34 +01:00
commit a8cf6edab0
2 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
source/Mobs/Wolf.cpp
View File

@ -15,7 +15,7 @@ cWolf::cWolf(void) :
m_IsTame(false),
m_IsSitting(false),
m_IsBegging(false),
m_Owner(""),
m_OwnerName(""),
m_CollarColor(14)
{
}
@ -64,11 +64,11 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
}
else if (IsTame())
{
if (a_Player.GetName() == m_Owner) // Is the player the owner of the dog?
if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
{
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
{
m_CollarColor = 15 - a_Player.GetEquippedItem().m_ItemDamage;
SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
if (!a_Player.IsGameModeCreative())
{
a_Player.GetInventory().RemoveOneEquippedItem();
@ -142,37 +142,44 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
}
}
if (IsTame())
{
TickFollowPlayer();
}
}
void cWolf::TickFollowPlayer()
{
class cCallback :
public cPlayerListCallback
{
virtual bool Item(cPlayer * Player) override
virtual bool Item(cPlayer * a_Player) override
{
OwnerCoords = Player->GetPosition();
OwnerPos = a_Player->GetPosition();
return false;
}
public:
Vector3f OwnerCoords;
Vector3f OwnerPos;
} Callback;
m_World->DoWithPlayer(m_Owner, Callback);
Vector3f OwnerCoords = Callback.OwnerCoords;
if (IsTame())
if (m_World->DoWithPlayer(m_OwnerName, Callback))
{
if (m_Owner != "")
// The player is present in the world, follow them:
double Distance = (Callback.OwnerPos - GetPosition()).Length();
if (Distance < 3)
{
double Distance = (OwnerCoords - GetPosition()).Length();
if (Distance < 3)
{
m_bMovingToDestination = false;
}
else if ((Distance > 30) && (!IsSitting()))
{
TeleportToCoords(OwnerCoords.x, OwnerCoords.y, OwnerCoords.z);
}
else
{
m_Destination = OwnerCoords;
}
m_bMovingToDestination = false;
}
else if ((Distance > 30) && (!IsSitting()))
{
TeleportToCoords(Callback.OwnerPos.x, Callback.OwnerPos.y, Callback.OwnerPos.z);
}
else
{
m_Destination = Callback.OwnerPos;
}
}
}

7
source/Mobs/Wolf.h
View File

@ -21,13 +21,14 @@ public:
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
virtual void OnRightClicked(cPlayer & a_Player) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void TickFollowPlayer();
// 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; }
AString GetOwner (void) const { return m_OwnerName; }
int GetCollarColor(void) const { return m_CollarColor; }
// Set functions
@ -35,7 +36,7 @@ public:
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 SetOwner (AString a_NewOwner) { m_OwnerName = a_NewOwner; }
void SetCollarColor(int a_CollarColor) { m_CollarColor = a_CollarColor; }
protected:
@ -44,7 +45,7 @@ protected:
bool m_IsTame;
bool m_IsBegging;
bool m_IsAngry;
AString m_Owner;
AString m_OwnerName;
int m_CollarColor;
} ;