diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-03 18:05:45 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-03 18:05:45 +0100 |
| commit | fe6dc5c3cd8f3d2888badf04ef8f9adfdc8f2cfd (patch) | |
| tree | 2d4dc3ce333f9184a4ac45472a41dcbab94b945c /src/server/game/Entities/Object | |
| parent | 7a47cec79db5e1e0e373a3dae53fd5e2485c8dfd (diff) | |
| parent | 6a29a957dddb41692f80b536cd3801fd5eed7910 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/ObjectDefines.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 021e3d0aea5..d0b9819b0a3 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -34,7 +34,7 @@ enum HighGuid HIGHGUID_DYNAMICOBJECT = 0xF100, // blizz F100 HIGHGUID_CORPSE = 0xF101, // blizz F100 HIGHGUID_MO_TRANSPORT = 0x1FC0, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT) - HIGHGUID_GROUP = 0x1F05 + HIGHGUID_GROUP = 0x1F50 }; // used for creating values for respawn for example @@ -198,15 +198,15 @@ uint32 GUID_HIPART(uint64 guid) uint32 GUID_ENPART(uint64 x) { return IsGuidHaveEnPart(x) - ? ((uint32)((x >> 32) & UI64LIT(0x00000000000FFFFF))) + ? (uint32)((x >> 24) & UI64LIT(0x0000000000FFFFFF)) : 0; } uint32 GUID_LOPART(uint64 x) { return IsGuidHaveEnPart(x) - ? ((uint32)(x & UI64LIT(0x00000000FFFFFFFF))) - : ((uint32)(x & UI64LIT(0x0000000000FFFFFF))); + ? (uint32)(x & UI64LIT(0x0000000000FFFFFF)) + : (uint32)(x & UI64LIT(0x00000000FFFFFFFF)); } bool IsGuidHaveEnPart(uint64 guid) |