diff --git a/src/game/Object.h b/src/game/Object.h index c91ad2a3f..000ebf8a9 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -128,7 +128,7 @@ class MANGOS_DLL_SPEC Object m_inWorld = true; // synchronize values mirror with values array (changes will send in updatecreate opcode any way - ClearUpdateMask(false); // false - we can't have update dat in update queue before adding to world + ClearUpdateMask(false); // false - we can't have update data in update queue before adding to world } virtual void RemoveFromWorld() { @@ -138,7 +138,6 @@ class MANGOS_DLL_SPEC Object } ObjectGuid const& GetObjectGuid() const { return GetGuidValue(OBJECT_FIELD_GUID); } - const uint64& GetGUID() const { return GetUInt64Value(OBJECT_FIELD_GUID); } // DEPRECATED, not use, will removed soon uint32 GetGUIDLow() const { return GetObjectGuid().GetCounter(); } PackedGuid const& GetPackGUID() const { return m_PackGUID; } std::string GetGuidStr() const { return GetObjectGuid().GetString(); } diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h index 9218aef0d..2822a5687 100644 --- a/src/game/ObjectGuid.h +++ b/src/game/ObjectGuid.h @@ -89,7 +89,7 @@ class MANGOS_DLL_SPEC ObjectGuid { public: // constructors ObjectGuid() : m_guid(0) {} - ObjectGuid(uint64 const& guid) : m_guid(guid) {} // temporary allowed implicit cast, really bad in connection with operator uint64() + explicit ObjectGuid(uint64 const& guid) : m_guid(guid) {} ObjectGuid(HighGuid hi, uint32 entry, uint32 counter) : m_guid(counter ? uint64(counter) | (uint64(entry) << 24) | (uint64(hi) << 48) : 0) {} ObjectGuid(HighGuid hi, uint32 counter) : m_guid(counter ? uint64(counter) | (uint64(hi) << 48) : 0) {} diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e9ae1cafc..cb41e678f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11618" + #define REVISION_NR "11619" #endif // __REVISION_NR_H__