aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectDefines.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-23 22:09:43 -0500
committermegamage <none@none>2009-08-23 22:09:43 -0500
commit1ee90e1022a235859316e55356ea8a3d2f456c9b (patch)
treeb3db14f5e81ac865bb3fe92158b8837eb9b0ca5f /src/game/ObjectDefines.h
parente71f5e474e2d935f2bfd8520dbf62a6f4b552a18 (diff)
*Update vehicle system. Make vehicle a seperate class from creature.
--HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectDefines.h')
-rw-r--r--src/game/ObjectDefines.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/ObjectDefines.h b/src/game/ObjectDefines.h
index 028367a7bf8..6a2eb7906eb 100644
--- a/src/game/ObjectDefines.h
+++ b/src/game/ObjectDefines.h
@@ -52,9 +52,10 @@ enum HighGuid
#define IS_CREATURE_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_UNIT )
#define IS_PET_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_PET )
#define IS_VEHICLE_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_VEHICLE )
-#define IS_CREATURE_OR_PET_GUID(Guid)( IS_CREATURE_GUID(Guid) || IS_PET_GUID(Guid) )
+#define IS_CRE_OR_VEH_GUID(Guid) ( IS_CREATURE_GUID(Guid) || IS_VEHICLE_GUID(Guid) )
+#define IS_CRE_OR_VEH_OR_PET_GUID(Guid)( IS_CRE_OR_VEH_GUID(Guid) || IS_PET_GUID(Guid) )
#define IS_PLAYER_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_PLAYER && Guid!=0 )
-#define IS_UNIT_GUID(Guid) ( IS_CREATURE_OR_PET_GUID(Guid) || IS_PLAYER_GUID(Guid) )
+#define IS_UNIT_GUID(Guid) ( IS_CRE_OR_VEH_OR_PET_GUID(Guid) || IS_PLAYER_GUID(Guid) )
// special case for empty guid need check
#define IS_ITEM_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_ITEM )
#define IS_GAMEOBJECT_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_GAMEOBJECT )