diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/PathGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_assembler/TileAssembler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index 803c9e653b4..4b9620bff1f 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -79,7 +79,7 @@ bool checkDirectories(bool debugOutput, std::vector<std::string>& dbcLocales) } dirFiles.clear(); - if (getDirContents(dirFiles, "vmaps", "*.vmtree") == LISTFILE_DIRECTORY_NOT_FOUND || dirFiles.empty()) + if (getDirContents(dirFiles, "vmaps/0000", "*.vmtree") == LISTFILE_DIRECTORY_NOT_FOUND || dirFiles.empty()) { printf("'vmaps' directory is empty or does not exist\n"); return false; diff --git a/src/tools/vmap4_assembler/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp index 162c1bad29e..2f96d3d4442 100644 --- a/src/tools/vmap4_assembler/TileAssembler.cpp +++ b/src/tools/vmap4_assembler/TileAssembler.cpp @@ -100,7 +100,6 @@ namespace VMAP threadPool.PostWork([this, file = directoryEntry.path(), &abortThreads, &workerIndexGen, &spawnedModelFilesByThread, &mapsToProcess] { thread_local std::size_t workerIndex = workerIndexGen++; - --mapsToProcess; auto dirf = OpenFile(file, "rb"); if (!dirf) @@ -127,6 +126,7 @@ namespace VMAP return abortThreads(); spawnedModelFilesByThread[workerIndex].merge(data.SpawnedModelFiles); + --mapsToProcess; }); } |