aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Grids/GridDefines.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-10-11 12:59:19 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-11 12:59:19 +0200
commitd7302ffd1499433fef2cc4e824ae9443c3d2c79f (patch)
tree7be39461e047ef032c5419e1cd5772be704fd464 /src/server/game/Grids/GridDefines.h
parent8492c273dd50227ca01ead785eda6c4de9361e74 (diff)
Core/Scenes: Implemented spell created SceneObjects
Diffstat (limited to 'src/server/game/Grids/GridDefines.h')
-rw-r--r--src/server/game/Grids/GridDefines.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index e01f6d25e5c..81248a93102 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -30,6 +30,7 @@ class GameObject;
class Pet;
class Player;
class AreaTrigger;
+class SceneObject;
class Conversation;
#define MAX_NUMBER_OF_CELLS 8
@@ -58,8 +59,8 @@ class Conversation;
// 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_6(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/, AreaTrigger, Conversation) AllGridObjectTypes;
-typedef TYPELIST_7(Creature, GameObject, DynamicObject, Pet, Corpse, AreaTrigger, Conversation) AllMapStoredObjectTypes;
+typedef TYPELIST_7(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/, AreaTrigger, SceneObject, Conversation) AllGridObjectTypes;
+typedef TYPELIST_8(Creature, GameObject, DynamicObject, Pet, Corpse, AreaTrigger, SceneObject, 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<SceneObject> SceneObjectMapType;
typedef GridRefManager<Conversation> ConversationMapType;
enum GridMapTypeMask
@@ -77,8 +79,9 @@ enum GridMapTypeMask
GRID_MAP_TYPE_MASK_GAMEOBJECT = 0x08,
GRID_MAP_TYPE_MASK_PLAYER = 0x10,
GRID_MAP_TYPE_MASK_AREATRIGGER = 0x20,
- GRID_MAP_TYPE_MASK_CONVERSATION = 0x40,
- GRID_MAP_TYPE_MASK_ALL = 0x7F
+ GRID_MAP_TYPE_MASK_SCENEOBJECT = 0x40,
+ GRID_MAP_TYPE_MASK_CONVERSATION = 0x80,
+ GRID_MAP_TYPE_MASK_ALL = 0xFF
};
typedef Grid<Player, AllWorldObjectTypes, AllGridObjectTypes> GridType;