minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Decoration, Ore: Resolve node names on Mapgen init

This commit is contained in:
kwolekr 2013-06-17 18:51:29 -04:00
parent 56093b6614
commit 0b20768a24
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emerge.cpp
View File

@ -123,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;

4
src/mapgen.cpp
View File

@ -109,8 +109,6 @@ void Ore::placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
if (!in_range)
return;
resolveNodeNames(mg->ndef);
int ymin, ymax;
if (in_range & ORE_RANGE_MIRROR) {
ymin = MYMAX(nmin.Y, -height_max);
@ -226,8 +224,6 @@ void Decoration::resolveNodeNames(INodeDefManager *ndef) {
void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
resolveNodeNames(mg->ndef);
PseudoRandom ps(blockseed + 53);
int carea_size = nmax.X - nmin.X + 1;