diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 6 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.h | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/PathCommon.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 3a066a33c7..aa35cee056 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -112,7 +112,7 @@ namespace MMAP mapID = uint32(atoi(file.substr(0, file.size() - 8).c_str())); if (std::find(m_tiles.begin(), m_tiles.end(), mapID) == m_tiles.end()) { - m_tiles.emplace_back(MapTiles(mapID, new std::set<uint32>)); + m_tiles.emplace_back(mapID, new std::set<uint32>); count++; } } @@ -124,7 +124,7 @@ namespace MMAP mapID = uint32(atoi(file.substr(0, file.size() - 7).c_str())); if (std::find(m_tiles.begin(), m_tiles.end(), mapID) == m_tiles.end()) { - m_tiles.emplace_back(MapTiles(mapID, new std::set<uint32>)); + m_tiles.emplace_back(mapID, new std::set<uint32>); count++; } } @@ -199,7 +199,7 @@ namespace MMAP return (*itr).m_tiles; std::set<uint32>* tiles = new std::set<uint32>(); - m_tiles.emplace_back(MapTiles(mapID, tiles)); + m_tiles.emplace_back(mapID, tiles); return tiles; } diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 464b12d190..59b865e047 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -47,7 +47,7 @@ namespace MMAP uint32 m_mapId; std::set<uint32>* m_tiles{nullptr}; - bool operator==(uint32 id) + bool operator==(uint32 id) const { return m_mapId == id; } diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h index 483b4783d9..8e15a8cf3e 100644 --- a/src/tools/mmaps_generator/PathCommon.h +++ b/src/tools/mmaps_generator/PathCommon.h @@ -90,7 +90,7 @@ namespace MMAP do { if ((findFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) - fileList.push_back(std::string(findFileInfo.cFileName)); + fileList.emplace_back(findFileInfo.cFileName); } while (FindNextFile(hFind, &findFileInfo)); FindClose(hFind); |