aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Maps/TileAssembler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-04-22 01:01:48 +0200
committerShauren <shauren.trinity@gmail.com>2018-04-22 01:01:48 +0200
commitedb2b16f546d18bb66f1527dddb6189f617ec1b3 (patch)
treec3a2c3414f3abdf7cba62b570f2168b2b07a45ca /src/common/Collision/Maps/TileAssembler.cpp
parenta4892d64fe2433814e92c39cfe9b0c425c08aae5 (diff)
Tools/mmaps_generator: Give land priority during area merges over liquids
Closes #21700
Diffstat (limited to 'src/common/Collision/Maps/TileAssembler.cpp')
-rw-r--r--src/common/Collision/Maps/TileAssembler.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index e9203ca7378..8a17dcb14fa 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(NULL), iCurrentUniqueNameId(0)
+ : iDestDir(pDestDirName), iSrcDir(pSrcDirName), iCurrentUniqueNameId(0)
{
boost::filesystem::create_directory(iDestDir);
//init();
@@ -243,8 +243,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, TileSpawn>(StaticMapTree::packTileID(tileX, tileY), TileSpawn{ spawn.ID, spawn.flags }));
}
bool success = (ferror(dirf) == 0);