diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-09-21 17:49:16 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-09-21 17:49:16 +0200 |
| commit | 243b80defb0515a74238f967908931a7cb2c7c41 (patch) | |
| tree | 6216fc7e05fc4444f203bc416f3daace1fa51dab /src | |
| parent | 2d277bc167c05a0f1a4364ac48f31263a3e23fac (diff) | |
Core/Entities: Fixed 4.3.4 guid format
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/ObjectGuid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 7ad4952993f..c9c17efe3f9 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -89,7 +89,7 @@ class ObjectGuid ObjectGuid() { _data._guid = UI64LIT(0); } explicit ObjectGuid(uint64 guid) { _data._guid = guid; } - ObjectGuid(HighGuid hi, uint32 entry, uint32 counter) { _data._guid = counter ? uint64(counter) | (uint64(entry) << 24) | (uint64(hi) << ((hi == HIGHGUID_CORPSE || hi == HIGHGUID_AREATRIGGER) ? 48 : 52)) : 0; } + ObjectGuid(HighGuid hi, uint32 entry, uint32 counter) { _data._guid = counter ? uint64(counter) | (uint64(entry) << 32) | (uint64(hi) << ((hi == HIGHGUID_CORPSE || hi == HIGHGUID_AREATRIGGER) ? 48 : 52)) : 0; } ObjectGuid(HighGuid hi, uint32 counter) { _data._guid = counter ? uint64(counter) | (uint64(hi) << ((hi == HIGHGUID_CORPSE || hi == HIGHGUID_AREATRIGGER) ? 48 : 52)) : 0; } operator uint64() const { return _data._guid; } |