Now using a TickFollowPlayer function.
This commit is contained in:
parent
1682c61b59
commit
1eb2b7e176
@ -15,8 +15,8 @@ cWolf::cWolf(void) :
|
|||||||
m_IsTame(false),
|
m_IsTame(false),
|
||||||
m_IsSitting(false),
|
m_IsSitting(false),
|
||||||
m_IsBegging(false),
|
m_IsBegging(false),
|
||||||
m_Owner(""),
|
m_OwnerName(""),
|
||||||
m_Collar(14)
|
m_CollarColor(14)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ void cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
|
|||||||
|
|
||||||
void cWolf::OnRightClicked(cPlayer & a_Player)
|
void cWolf::OnRightClicked(cPlayer & a_Player)
|
||||||
{
|
{
|
||||||
if ((!IsTame()) && (!IsAngry()))
|
if (!IsTame() && !IsAngry())
|
||||||
{
|
{
|
||||||
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_BONE)
|
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_BONE)
|
||||||
{
|
{
|
||||||
@ -64,11 +64,11 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
|
|||||||
}
|
}
|
||||||
else if (IsTame())
|
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)
|
if (a_Player.GetEquippedItem().m_ItemType == E_ITEM_DYE)
|
||||||
{
|
{
|
||||||
m_Collar = 15 - a_Player.GetEquippedItem().m_ItemDamage;
|
SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
|
||||||
if (!a_Player.IsGameModeCreative())
|
if (!a_Player.IsGameModeCreative())
|
||||||
{
|
{
|
||||||
a_Player.GetInventory().RemoveOneEquippedItem();
|
a_Player.GetInventory().RemoveOneEquippedItem();
|
||||||
@ -97,7 +97,9 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
if (!IsAngry())
|
if (!IsAngry())
|
||||||
{
|
{
|
||||||
cMonster::Tick(a_Dt, a_Chunk);
|
cMonster::Tick(a_Dt, a_Chunk);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
super::Tick(a_Dt, a_Chunk);
|
super::Tick(a_Dt, a_Chunk);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,35 +141,45 @@ void cWolf::Tick(float a_Dt, cChunk & a_Chunk)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class cCallback :
|
|
||||||
public cPlayerListCallback
|
|
||||||
{
|
|
||||||
virtual bool Item(cPlayer * Player) override
|
|
||||||
{
|
|
||||||
OwnerCoords = Player->GetPosition();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
public:
|
|
||||||
Vector3f OwnerCoords;
|
|
||||||
} ;
|
|
||||||
cCallback Callback;
|
|
||||||
m_World->DoWithPlayer(m_Owner, Callback);
|
|
||||||
Vector3f OwnerCoords = Callback.OwnerCoords;
|
|
||||||
|
|
||||||
if (IsTame())
|
if (IsTame())
|
||||||
{
|
{
|
||||||
if (m_Owner != "")
|
TickFollowPlayer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cWolf::TickFollowPlayer()
|
||||||
|
{
|
||||||
|
class cCallback :
|
||||||
|
public cPlayerListCallback
|
||||||
|
{
|
||||||
|
virtual bool Item(cPlayer * a_Player) override
|
||||||
{
|
{
|
||||||
double Distance = (OwnerCoords - GetPosition()).Length();
|
OwnerPos = a_Player->GetPosition();
|
||||||
if (Distance < 3)
|
return false;
|
||||||
{
|
}
|
||||||
m_bMovingToDestination = false;
|
public:
|
||||||
} else if((Distance > 30) && (!IsSitting())) {
|
Vector3f OwnerPos;
|
||||||
TeleportToCoords(OwnerCoords.x, OwnerCoords.y, OwnerCoords.z);
|
} Callback;
|
||||||
} else {
|
if (m_World->DoWithPlayer(m_OwnerName, Callback))
|
||||||
m_Destination = OwnerCoords;
|
{
|
||||||
}
|
// The player is present in the world, follow them:
|
||||||
|
double Distance = (Callback.OwnerPos - GetPosition()).Length();
|
||||||
|
if (Distance < 3)
|
||||||
|
{
|
||||||
|
m_bMovingToDestination = false;
|
||||||
|
}
|
||||||
|
else if ((Distance > 30) && (!IsSitting()))
|
||||||
|
{
|
||||||
|
TeleportToCoords(Callback.OwnerPos.x, Callback.OwnerPos.y, Callback.OwnerPos.z);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_Destination = Callback.OwnerPos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -21,30 +21,32 @@ public:
|
|||||||
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
|
virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override;
|
||||||
virtual void OnRightClicked(cPlayer & a_Player) override;
|
virtual void OnRightClicked(cPlayer & a_Player) override;
|
||||||
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
|
||||||
|
virtual void TickFollowPlayer();
|
||||||
|
|
||||||
// Get functions
|
// Get functions
|
||||||
bool IsSitting(void) const { return m_IsSitting; }
|
bool IsSitting (void) const { return m_IsSitting; }
|
||||||
bool IsTame(void) const { return m_IsTame; }
|
bool IsTame (void) const { return m_IsTame; }
|
||||||
bool IsBegging(void) const { return m_IsBegging; }
|
bool IsBegging (void) const { return m_IsBegging; }
|
||||||
bool IsAngry(void) const { return m_IsAngry; }
|
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_Collar; }
|
int GetCollarColor(void) const { return m_CollarColor; }
|
||||||
|
|
||||||
// Set functions
|
// Set functions
|
||||||
void SetIsSitting(bool a_IsSitting) { m_IsSitting = a_IsSitting; }
|
void SetIsSitting (bool a_IsSitting) { m_IsSitting = a_IsSitting; }
|
||||||
void SetIsTame(bool a_IsTame) { m_IsTame = a_IsTame; }
|
void SetIsTame (bool a_IsTame) { m_IsTame = a_IsTame; }
|
||||||
void SetIsBegging(bool a_IsBegging) { m_IsBegging = a_IsBegging; }
|
void SetIsBegging (bool a_IsBegging) { m_IsBegging = a_IsBegging; }
|
||||||
void SetIsAngry(bool a_IsAngry) { m_IsAngry = a_IsAngry; }
|
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; }
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
|
|
||||||
bool m_IsSitting;
|
bool m_IsSitting;
|
||||||
bool m_IsTame;
|
bool m_IsTame;
|
||||||
bool m_IsBegging;
|
bool m_IsBegging;
|
||||||
bool m_IsAngry;
|
bool m_IsAngry;
|
||||||
AString m_Owner;
|
AString m_OwnerName;
|
||||||
int m_Collar;
|
int m_CollarColor;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user