diff options
| author | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
| commit | 3af90db5b51da0c37f77fe6410e488c8c27acd67 (patch) | |
| tree | 12edd6f0661b464e36863517241b5ec0b87b5ec1 /src/emerge.cpp | |
| parent | 58f3cd3eb598a7cf79983fe9e48c738591c6e004 (diff) | |
| parent | b1ebd9f79c63cf78b0e0fb2ea6f52d82cdfb95b6 (diff) | |
| download | minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.tar.gz minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.tar.bz2 minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/emerge.cpp')
| -rw-r--r-- | src/emerge.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index fd6c0e91f..9edc42b7b 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -101,6 +101,10 @@ EmergeManager::~EmergeManager() { for (unsigned int i = 0; i < ores.size(); i++) delete ores[i]; ores.clear(); + + for (unsigned int i = 0; i < decorations.size(); i++) + delete decorations[i]; + decorations.clear(); for (std::map<std::string, MapgenFactory *>::iterator iter = mglist.begin(); iter != mglist.end(); iter ++) { @@ -119,9 +123,13 @@ void EmergeManager::initMapgens(MapgenParams *mgparams) { return; biomedef->resolveNodeNames(ndef); + for (size_t i = 0; i != ores.size(); i++) + ores[i]->resolveNodeNames(ndef); + for (size_t i = 0; i != decorations.size(); i++) + decorations[i]->resolveNodeNames(ndef); this->params = mgparams; - for (unsigned int i = 0; i != emergethread.size(); i++) { + for (size_t i = 0; i != emergethread.size(); i++) { mg = createMapgen(params->mg_name, 0, params); if (!mg) { infostream << "EmergeManager: falling back to mapgen v6" << std::endl; |