diff options
| author | leak <leak@bitmx.net> | 2014-07-06 20:07:52 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-07-06 20:07:52 +0200 |
| commit | 013e3f4c0ce05f53888a8a88053c613502e52ac6 (patch) | |
| tree | cf85009dc0bea6cf27bd1d294c0e58bd84ebe786 /src/server/game/Maps/Map.cpp | |
| parent | 80a8ed23b710459342abd16cda9da6695929c467 (diff) | |
| parent | a6494375f9839b8c428c8daa508b9ca93caa0575 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index bdf42a26320..bfb38a31248 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -119,6 +119,9 @@ bool Map::ExistVMap(uint32 mapid, int gx, int gy) void Map::LoadMMap(int gx, int gy) { + if (!MMAP::MMapFactory::IsPathfindingEnabled(GetId())) + return; + bool mmapLoadResult = MMAP::MMapFactory::createOrGetMMapManager()->loadMap((sWorld->GetDataPath() + "mmaps").c_str(), GetId(), gx, gy); if (mmapLoadResult) @@ -129,6 +132,8 @@ void Map::LoadMMap(int gx, int gy) void Map::LoadVMap(int gx, int gy) { + if (!VMAP::VMapFactory::createOrGetVMapManager()->isMapLoadingEnabled()) + return; // x and y are swapped !! int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath()+ "vmaps").c_str(), GetId(), gx, gy); switch (vmapLoadResult) |