diff options
author | Traesh <Traesh@users.noreply.github.com> | 2017-05-14 11:40:55 +0200 |
---|---|---|
committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-05-14 11:40:55 +0200 |
commit | c73ce93f4cf84667d23c2ec7e425f40a845eaf4f (patch) | |
tree | 255a3af04144a58e3156491bffd1aa743fb06bfa /src/server/game/Grids/GridDefines.h | |
parent | 3e18fcb8fd4ac8e9700f10eb3b6a1292c0f8beb8 (diff) |
Core/Entities : Basic Conversation Implementation (#18010)
Diffstat (limited to 'src/server/game/Grids/GridDefines.h')
-rw-r--r-- | src/server/game/Grids/GridDefines.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 4c89e90b66e..55e6ae1ab24 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -31,6 +31,7 @@ class GameObject; class Pet; class Player; class AreaTrigger; +class Conversation; #define MAX_NUMBER_OF_CELLS 8 @@ -58,8 +59,8 @@ class AreaTrigger; // Creature used instead pet to simplify *::Visit templates (not required duplicate code for Creature->Pet case) typedef TYPELIST_4(Player, Creature/*pets*/, Corpse/*resurrectable*/, DynamicObject/*farsight target*/) AllWorldObjectTypes; -typedef TYPELIST_5(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/, AreaTrigger) AllGridObjectTypes; -typedef TYPELIST_6(Creature, GameObject, DynamicObject, Pet, Corpse, AreaTrigger) AllMapStoredObjectTypes; +typedef TYPELIST_6(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/, AreaTrigger, Conversation) AllGridObjectTypes; +typedef TYPELIST_7(Creature, GameObject, DynamicObject, Pet, Corpse, AreaTrigger, Conversation) AllMapStoredObjectTypes; typedef GridRefManager<Corpse> CorpseMapType; typedef GridRefManager<Creature> CreatureMapType; @@ -67,6 +68,7 @@ typedef GridRefManager<DynamicObject> DynamicObjectMapType; typedef GridRefManager<GameObject> GameObjectMapType; typedef GridRefManager<Player> PlayerMapType; typedef GridRefManager<AreaTrigger> AreaTriggerMapType; +typedef GridRefManager<Conversation> ConversationMapType; enum GridMapTypeMask { @@ -76,7 +78,8 @@ enum GridMapTypeMask GRID_MAP_TYPE_MASK_GAMEOBJECT = 0x08, GRID_MAP_TYPE_MASK_PLAYER = 0x10, GRID_MAP_TYPE_MASK_AREATRIGGER = 0x20, - GRID_MAP_TYPE_MASK_ALL = 0x3F + GRID_MAP_TYPE_MASK_CONVERSATION = 0x40, + GRID_MAP_TYPE_MASK_ALL = 0x7F }; typedef Grid<Player, AllWorldObjectTypes, AllGridObjectTypes> GridType; |