aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-02 22:03:35 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-02 22:03:35 +0100
commitee2e776fea38313669fba1f5cb008be648daf7fc (patch)
tree783681f4692815351e13524a2cb13124ca5a2093 /src/server/game/Entities
parent5bbf7829b21e9a3d7f7c4e068ce779c5975b8c36 (diff)
parent57c275f3e176d561cff5823ab1a89054aba033ef (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Object/ObjectDefines.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index e41716dde36..021e3d0aea5 100644
--- a/src/server/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
@@ -23,18 +23,18 @@
enum HighGuid
{
- HIGHGUID_ITEM = 0x400, // blizz 4000
- HIGHGUID_CONTAINER = 0x400, // blizz 4000
- HIGHGUID_PLAYER = 0x000, // blizz 0000
- HIGHGUID_GAMEOBJECT = 0xF11, // blizz F110
- HIGHGUID_TRANSPORT = 0xF12, // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
- HIGHGUID_UNIT = 0xF13, // blizz F130
- HIGHGUID_PET = 0xF14, // blizz F140
- HIGHGUID_VEHICLE = 0xF15, // blizz F550
- HIGHGUID_DYNAMICOBJECT = 0xF10, // blizz F100
+ HIGHGUID_ITEM = 0x4000, // blizz 4000
+ HIGHGUID_CONTAINER = 0x4000, // blizz 4000
+ HIGHGUID_PLAYER = 0x0000, // blizz 0000
+ HIGHGUID_GAMEOBJECT = 0xF110, // blizz F110
+ HIGHGUID_TRANSPORT = 0xF120, // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
+ HIGHGUID_UNIT = 0xF130, // blizz F130
+ HIGHGUID_PET = 0xF140, // blizz F140
+ HIGHGUID_VEHICLE = 0xF150, // blizz F550
+ HIGHGUID_DYNAMICOBJECT = 0xF100, // blizz F100
HIGHGUID_CORPSE = 0xF101, // blizz F100
- HIGHGUID_MO_TRANSPORT = 0x1FC, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
- HIGHGUID_GROUP = 0x1F5
+ HIGHGUID_MO_TRANSPORT = 0x1FC0, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
+ HIGHGUID_GROUP = 0x1F05
};
// used for creating values for respawn for example