diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-27 13:19:56 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-27 13:19:56 +0100 |
| commit | 1b8d917ea9ba4cb7190a8da94d9128cb9bd561a4 (patch) | |
| tree | 9479c21968ddf6b267cdc51b8586deb6986dd73d /src/server/game/Maps/MapManager.h | |
| parent | c97c381ea0b63963b3756f531b8c64636cb5d66b (diff) | |
| parent | b78885622078bcf56b21694b39964c25ae4794f6 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Maps/MapManager.h')
| -rw-r--r-- | src/server/game/Maps/MapManager.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 09e09a80148..8af609c61e2 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -19,14 +19,15 @@ #ifndef TRINITY_MAPMANAGER_H #define TRINITY_MAPMANAGER_H -#include "Define.h" -#include <ace/Singleton.h> -#include <ace/Thread_Mutex.h> -#include "Common.h" +#include "Object.h" #include "Map.h" #include "GridStates.h" #include "MapUpdater.h" +#include <ace/Singleton.h> +#include <ace/Thread_Mutex.h> + + class Transport; struct TransportCreatureProto; |