diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-04-22 01:01:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-02-23 22:00:05 +0100 |
| commit | 7b561373a892c74870a21cf31687df4afd554495 (patch) | |
| tree | 2161514b5f1d1c8e4fdf2bc57b9c285ae8973d4e /src/common/Collision/Maps/TileAssembler.cpp | |
| parent | 8d19fcbc469e0b37a323c876a15097fbe848d884 (diff) | |
Tools/mmaps_generator: Give land priority during area merges over liquids
Closes #21700
(cherry picked from commit edb2b16f546d18bb66f1527dddb6189f617ec1b3)
Diffstat (limited to 'src/common/Collision/Maps/TileAssembler.cpp')
| -rw-r--r-- | src/common/Collision/Maps/TileAssembler.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 37dc0ee55a4..250c40293e1 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -54,7 +54,7 @@ namespace VMAP //================================================================= TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName) - : iDestDir(pDestDirName), iSrcDir(pSrcDirName), iFilterMethod(nullptr), iCurrentUniqueNameId(0) + : iDestDir(pDestDirName), iSrcDir(pSrcDirName), iCurrentUniqueNameId(0) { boost::filesystem::create_directory(iDestDir); //init(); @@ -236,8 +236,10 @@ namespace VMAP printf("spawning Map %u\n", mapID); mapData[mapID] = current = new MapSpawns(); } - else current = (*map_iter).second; - current->UniqueEntries.insert(pair<uint32, ModelSpawn>(spawn.ID, spawn)); + else + current = map_iter->second; + + current->UniqueEntries.emplace(spawn.ID, spawn); current->TileEntries.insert(pair<uint32, uint32>(StaticMapTree::packTileID(tileX, tileY), spawn.ID)); } bool success = (ferror(dirf) == 0); |