diff options
| author | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
| commit | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (patch) | |
| tree | 1e9ef1be1b3295a8673d6e4f0bdeb4c2d3a6015f /src/mg_schematic.cpp | |
| parent | 8077612dcb48221281e726a60eb97bf73fde462b (diff) | |
| parent | 231ac33d34dfaaddf292c5f31b1eae43eeefba2d (diff) | |
| download | minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.gz minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.bz2 minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.zip | |
Merge 0.4.15 changes into stable-0.4
0.4.15 release!
Diffstat (limited to 'src/mg_schematic.cpp')
| -rw-r--r-- | src/mg_schematic.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp index 0b95fa267..e028215dc 100644 --- a/src/mg_schematic.cpp +++ b/src/mg_schematic.cpp @@ -564,14 +564,14 @@ void Schematic::applyProbabilities(v3s16 p0, void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount, std::vector<std::string> *usednodes, INodeDefManager *ndef) { - std::map<content_t, content_t> nodeidmap; + UNORDERED_MAP<content_t, content_t> nodeidmap; content_t numids = 0; for (size_t i = 0; i != nodecount; i++) { content_t id; content_t c = nodes[i].getContent(); - std::map<content_t, content_t>::const_iterator it = nodeidmap.find(c); + UNORDERED_MAP<content_t, content_t>::const_iterator it = nodeidmap.find(c); if (it == nodeidmap.end()) { id = numids; numids++; |