Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / mg_schematic.cpp

diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp
index 92e138df4ba4a5f8eb4353f2c27c17e6c9ea446f..c50e90b3a54d35f7abdf2cb7f09f0ee518f81eca 100644 (file)
--- a/src/mg_schematic.cpp
+++ b/src/mg_schematic.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -36,9 +37,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 SchematicManager::SchematicManager(Server *server) :
-       ObjDefManager(server, OBJDEF_SCHEMATIC)
+       ObjDefManager(server, OBJDEF_SCHEMATIC),
+       m_server(server)
 {
-       m_server = server;
 }
 
 
@@ -68,10 +69,6 @@ void SchematicManager::clear()
 
 Schematic::Schematic()
 {
-       schemdata   = NULL;
-       slice_probs = NULL;
-       flags       = 0;
-       size        = v3s16(0, 0, 0);
 }
 
 
@@ -560,14 +557,14 @@ void Schematic::applyProbabilities(v3s16 p0,
 void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount,
        std::vector<std::string> *usednodes, INodeDefManager *ndef)
 {
-       UNORDERED_MAP<content_t, content_t> nodeidmap;
+       std::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();
 
-               UNORDERED_MAP<content_t, content_t>::const_iterator it = nodeidmap.find(c);
+               std::unordered_map<content_t, content_t>::const_iterator it = nodeidmap.find(c);
                if (it == nodeidmap.end()) {
                        id = numids;
                        numids++;