From ae58481c21d73824cb4e76e5d6f392fb861ec88c Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 24 Oct 2010 22:03:53 +0200 Subject: Core/Entities: Remove circular dependencies from GameObject headers, fixes *nix compile --HG-- branch : trunk extra : rebase_source : bcedd4aed81ad6fb72a13607cf954c11356bbfcc --- src/server/game/AI/CreatureAISelector.h | 4 +++- src/server/game/Entities/GameObject/GameObject.cpp | 2 +- src/server/game/Entities/GameObject/GameObject.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h index d5155045aff..f80ba1ec16b 100755 --- a/src/server/game/AI/CreatureAISelector.h +++ b/src/server/game/AI/CreatureAISelector.h @@ -22,12 +22,14 @@ class CreatureAI; class Creature; class MovementGenerator; +class GameObjectAI; +class GameObject; namespace FactorySelector { CreatureAI* selectAI(Creature *); MovementGenerator* selectMovementGenerator(Creature *); - GameObjectAI* SelectGameObjectAI(GameObject *go); + GameObjectAI* SelectGameObjectAI(GameObject *); } #endif diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index d7270af5ae2..f13108bab4e 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "QuestDef.h" -#include "GameObject.h" +#include "GameObjectAI.h" #include "ObjectMgr.h" #include "PoolMgr.h" #include "SpellMgr.h" diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index c865631c13e..862fa3524bb 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -24,7 +24,8 @@ #include "Object.h" #include "LootMgr.h" #include "DatabaseEnv.h" -#include "GameObjectAI.h" + +class GameObjectAI; // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform #if defined(__GNUC__) -- cgit v1.2.3