mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11619] Remove depricated GetGUID and forbit implicit uint64->ObjectGuid casts

Browse source
This commit is contained in:
VladimirMangos 2011-06-10 16:59:10 +04:00
parent 9ae4d59540
commit de0fc143f6
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Object.h
View file

@ -128,7 +128,7 @@ class MANGOS_DLL_SPEC Object
m_inWorld = true; m_inWorld = true;
// synchronize values mirror with values array (changes will send in updatecreate opcode any way // 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() virtual void RemoveFromWorld()
{ {
@ -138,7 +138,6 @@ class MANGOS_DLL_SPEC Object
} }
ObjectGuid const& GetObjectGuid() const { return GetGuidValue(OBJECT_FIELD_GUID); } 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(); } uint32 GetGUIDLow() const { return GetObjectGuid().GetCounter(); }
PackedGuid const& GetPackGUID() const { return m_PackGUID; } PackedGuid const& GetPackGUID() const { return m_PackGUID; }
std::string GetGuidStr() const { return GetObjectGuid().GetString(); } std::string GetGuidStr() const { return GetObjectGuid().GetString(); }

2
src/game/ObjectGuid.h
View file

@ -89,7 +89,7 @@ class MANGOS_DLL_SPEC ObjectGuid
{ {
public: // constructors public: // constructors
ObjectGuid() : m_guid(0) {} 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 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) {} ObjectGuid(HighGuid hi, uint32 counter) : m_guid(counter ? uint64(counter) | (uint64(hi) << 48) : 0) {}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11618" #define REVISION_NR "11619"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__