diff options
| author | Carbenium <carbenium@outlook.com> | 2015-11-25 00:46:52 +0100 |
|---|---|---|
| committer | Carbenium <carbenium@outlook.com> | 2015-11-25 00:46:52 +0100 |
| commit | e4bdaa01106fffe23ac3b0c7511a7ffe5ea8fd47 (patch) | |
| tree | 849d8472b3de4e7a2b49486e8d3e7aaaaab55a0b | |
| parent | b86972f9779830ed65ca2e86eae4956da40e3c22 (diff) | |
| parent | 32a82dc956cbe3b782b518d1b0645dc3d20df6f2 (diff) | |
Merge pull request #15889 from Zedron/6.x
Core/MMaps: Fixed mmap loading after recent format change
| -rw-r--r-- | src/common/Collision/Management/MMapManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 0a6df783647..213d1d436bf 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -23,8 +23,8 @@ namespace MMAP { - static char const* const MAP_FILE_NAME_FORMAT = "%smmaps/%04i.mmap"; - static char const* const TILE_FILE_NAME_FORMAT = "%smmaps/%04i%02i%02i.mmtile"; + static char const* const MAP_FILE_NAME_FORMAT = "%s/mmaps/%04i.mmap"; + static char const* const TILE_FILE_NAME_FORMAT = "%s/mmaps/%04i%02i%02i.mmtile"; // ######################## MMapManager ######################## MMapManager::~MMapManager() @@ -81,7 +81,7 @@ namespace MMAP } // load and init dtNavMesh - read parameters from file - std::string fileName = Trinity::StringFormat(MAP_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", "./").c_str(), mapId); + std::string fileName = Trinity::StringFormat(MAP_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", ".").c_str(), mapId); FILE* file = fopen(fileName.c_str(), "rb"); if (!file) { @@ -137,7 +137,7 @@ namespace MMAP return false; // load this tile :: mmaps/MMMMXXYY.mmtile - std::string fileName = Trinity::StringFormat(TILE_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", "./").c_str(), mapId, x, y); + std::string fileName = Trinity::StringFormat(TILE_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", ".").c_str(), mapId, x, y); FILE* file = fopen(fileName.c_str(), "rb"); if (!file) { @@ -200,7 +200,7 @@ namespace MMAP PhasedTile* MMapManager::LoadTile(uint32 mapId, int32 x, int32 y) { // load this tile :: mmaps/MMMXXYY.mmtile - std::string fileName = Trinity::StringFormat(TILE_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", "./").c_str(), mapId, x, y); + std::string fileName = Trinity::StringFormat(TILE_FILE_NAME_FORMAT, sConfigMgr->GetStringDefault("DataDir", ".").c_str(), mapId, x, y); FILE* file = fopen(fileName.c_str(), "rb"); if (!file) { |