diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/biome.cpp | 12 | ||||
| -rw-r--r-- | src/mapgen.cpp | 10 | ||||
| -rw-r--r-- | src/mapgen.h | 9 | ||||
| -rw-r--r-- | src/mapgen_v7.cpp | 4 | ||||
| -rw-r--r-- | src/script/lua_api/luaapi.cpp | 7 |
5 files changed, 18 insertions, 24 deletions
diff --git a/src/biome.cpp b/src/biome.cpp index bc84d4bc1..356476b13 100644 --- a/src/biome.cpp +++ b/src/biome.cpp @@ -47,10 +47,10 @@ BiomeDefManager::BiomeDefManager() { b->c_filler = b->c_top; b->filler_height = MAP_GENERATION_LIMIT; - b->height_min = -MAP_GENERATION_LIMIT; - b->height_max = MAP_GENERATION_LIMIT; - b->heat_point = 0.0; - b->humidity_point = 0.0; + b->height_min = -MAP_GENERATION_LIMIT; + b->height_max = MAP_GENERATION_LIMIT; + b->heat_point = 0.0; + b->humidity_point = 0.0; biomes.push_back(b); } @@ -156,8 +156,8 @@ Biome *BiomeDefManager::getBiome(float heat, float humidity, s16 y) { if (y > b->height_max || y < b->height_min) continue; - float d_heat = heat - b->heat_point; - float d_humidity = humidity - b->humidity_point; + float d_heat = heat - b->heat_point; + float d_humidity = humidity - b->humidity_point; float dist = (d_heat * d_heat) + (d_humidity * d_humidity); if (dist < dist_min) { diff --git a/src/mapgen.cpp b/src/mapgen.cpp index a79789b06..53982e964 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -311,7 +311,7 @@ void Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) { } } - generate(mg, &ps, max_y, 0, v3s16(x, y, z)); + generate(mg, &ps, max_y, v3s16(x, y, z)); } } } @@ -409,8 +409,7 @@ void DecoSimple::resolveNodeNames(INodeDefManager *ndef) { } -void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, - s16 start_y, v3s16 p) { +void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p) { ManualMapVoxelManipulator *vm = mg->vm; u32 vi = vm->m_area.index(p); @@ -451,7 +450,7 @@ void DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, height = MYMIN(height, max_y - p.Y); v3s16 em = vm->m_area.getExtent(); - for (int i = start_y; i < height; i++) { + for (int i = 0; i < height; i++) { vm->m_area.add_y(em, vi, 1); content_t c = vm->m_data[vi].getContent(); @@ -520,8 +519,7 @@ void DecoSchematic::resolveNodeNames(INodeDefManager *ndef) { } -void DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, - s16 start_y, v3s16 p) { +void DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p) { ManualMapVoxelManipulator *vm = mg->vm; if (flags & DECO_PLACE_CENTER_X) diff --git a/src/mapgen.h b/src/mapgen.h index aa71b70c3..b2fbe7429 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -221,8 +221,7 @@ public: void placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); void placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); - virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, - s16 start_y, v3s16 p) = 0; + virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p) = 0; virtual int getHeight() = 0; virtual std::string getName() = 0; }; @@ -243,8 +242,7 @@ public: ~DecoSimple() {} void resolveNodeNames(INodeDefManager *ndef); - virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, - s16 start_y, v3s16 p); + virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p); virtual int getHeight(); virtual std::string getName(); }; @@ -264,8 +262,7 @@ public: ~DecoSchematic(); void resolveNodeNames(INodeDefManager *ndef); - virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, - s16 start_y, v3s16 p); + virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p); virtual int getHeight(); virtual std::string getName(); diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 2439c95b3..301922be5 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -132,8 +132,6 @@ int MapgenV7::getGroundLevelAtPoint(v2s16 p) { y--; } - if (iters == 0) - printf("iters exhausted at %d %d\n", p.X, p.Y); return y + b->top_depth; } @@ -442,7 +440,7 @@ void MapgenV7::addTopNodes() { continue; } - // N.B. It is necessary to search downward since range_heightmap[i] + // N.B. It is necessary to search downward since ridge_heightmap[i] // might not be the actual height, just the lowest part in the chunk // where a ridge had been carved u32 i = vm->m_area.index(x, y, z); diff --git a/src/script/lua_api/luaapi.cpp b/src/script/lua_api/luaapi.cpp index dea4ccf33..a5993fa47 100644 --- a/src/script/lua_api/luaapi.cpp +++ b/src/script/lua_api/luaapi.cpp @@ -674,7 +674,7 @@ int ModApiBasic::l_register_ore(lua_State *L) verbosestream << "register_ore: ore '" << ore->ore_name << "' registered" << std::endl; - return 0; + return 1; } // register_decoration({lots of stuff}) @@ -793,7 +793,7 @@ int ModApiBasic::l_register_decoration(lua_State *L) verbosestream << "register_decoration: decoration '" << deco->getName() << "' registered" << std::endl; - return 0; + return 1; } // create_schematic(p1, p2, probability_list, filename) @@ -841,7 +841,8 @@ int ModApiBasic::l_create_schematic(lua_State *L) dschem.applyProbabilities(&probability_list, p1); dschem.saveSchematicFile(ndef); - actionstream << "create_schematic: saved schematic file '" << dschem.filename << "'." << std::endl; + actionstream << "create_schematic: saved schematic file '" + << dschem.filename << "'." << std::endl; return 1; } |