diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Mobs/Ocelot.h | 7 | ||||
| -rw-r--r-- | src/Mobs/Wolf.cpp | 2 | ||||
| -rw-r--r-- | src/Mobs/Wolf.h | 15 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/Mobs/Ocelot.h b/src/Mobs/Ocelot.h index 59b4f25af..75758a973 100644 --- a/src/Mobs/Ocelot.h +++ b/src/Mobs/Ocelot.h @@ -2,6 +2,7 @@ #pragma once #include "PassiveMonster.h" +#include "../UUID.h" @@ -40,14 +41,14 @@ public: bool IsTame (void) const override { return m_IsTame; } bool IsBegging (void) const { return m_IsBegging; } AString GetOwnerName (void) const { return m_OwnerName; } - AString GetOwnerUUID (void) const { return m_OwnerUUID; } + cUUID GetOwnerUUID (void) const { return m_OwnerUUID; } eCatType GetOcelotType (void) const { return m_CatType; } // 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 SetOwner (const AString & a_NewOwnerName, const AString & a_NewOwnerUUID) + void SetOwner (const AString & a_NewOwnerName, const cUUID & a_NewOwnerUUID) { m_OwnerName = a_NewOwnerName; m_OwnerUUID = a_NewOwnerUUID; @@ -66,7 +67,7 @@ protected: /** Only check for a nearby player holding the breeding items every 23 ticks. */ int m_CheckPlayerTickCount; AString m_OwnerName; - AString m_OwnerUUID; + cUUID m_OwnerUUID; } ; diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp index 33a9b31ee..f3b859c76 100644 --- a/src/Mobs/Wolf.cpp +++ b/src/Mobs/Wolf.cpp @@ -117,7 +117,7 @@ bool cWolf::Attack(std::chrono::milliseconds a_Dt) -void cWolf::ReceiveNearbyFightInfo(AString a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved) +void cWolf::ReceiveNearbyFightInfo(const cUUID & a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved) { if ( (a_Opponent == nullptr) || IsSitting() || (!IsTame()) || diff --git a/src/Mobs/Wolf.h b/src/Mobs/Wolf.h index e05fedbf8..861419ba8 100644 --- a/src/Mobs/Wolf.h +++ b/src/Mobs/Wolf.h @@ -2,6 +2,7 @@ #pragma once #include "PassiveAggressiveMonster.h" +#include "../UUID.h" class cEntity; @@ -31,7 +32,7 @@ public: bool IsBegging (void) const { return m_IsBegging; } bool IsAngry (void) const { return m_IsAngry; } AString GetOwnerName (void) const { return m_OwnerName; } - AString GetOwnerUUID (void) const { return m_OwnerUUID; } + cUUID GetOwnerUUID (void) const { return m_OwnerUUID; } int GetCollarColor(void) const { return m_CollarColor; } // Set functions @@ -40,7 +41,7 @@ public: void SetIsBegging (bool a_IsBegging) { m_IsBegging = a_IsBegging; } void SetIsAngry (bool a_IsAngry) { m_IsAngry = a_IsAngry; } void SetCollarColor(int a_CollarColor) { m_CollarColor = a_CollarColor; } - void SetOwner (const AString & a_NewOwnerName, const AString & a_NewOwnerUUID) + void SetOwner (const AString & a_NewOwnerName, const cUUID & a_NewOwnerUUID) { m_OwnerName = a_NewOwnerName; m_OwnerUUID = a_NewOwnerUUID; @@ -48,12 +49,12 @@ public: /** Notfies the wolf of a nearby fight. The wolf may then decide to attack a_Opponent. - If a_IsPlayer is true, then the player whose ID is a_PlayerID is fighting a_Opponent - If false, then a wolf owned by the player whose ID is a_PlayerID is fighting a_Opponent - @param a_PlayerID The ID of the fighting player, or the ID of the owner whose wolf is fighting. + If a_IsPlayerInvolved is true, then the player whose UUID is a_PlayerUUID is fighting a_Opponent + If false, then a wolf owned by the player whose UUID is a_PlayerUUID is fighting a_Opponent + @param a_PlayerUUID The UUID of the fighting player, or the UUID of the owner whose wolf is fighting. @param a_Opponent The opponent who is being faught. @param a_IsPlayerInvolved Whether the fighter a player or a wolf. */ - void ReceiveNearbyFightInfo(AString a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved); + void ReceiveNearbyFightInfo(const cUUID & a_PlayerUUID, cPawn * a_Opponent, bool a_IsPlayerInvolved); virtual void InStateIdle(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; @@ -64,7 +65,7 @@ protected: bool m_IsBegging; bool m_IsAngry; AString m_OwnerName; - AString m_OwnerUUID; + cUUID m_OwnerUUID; int m_CollarColor; int m_NotificationCooldown; } ; |