summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-06-22 17:27:48 -0400
committerkwolekr <kwolekr@minetest.net>2013-06-22 17:27:48 -0400
commit4d77781ce7cba571701e731b1f442af691933720 (patch)
treef5f4d419e774031c03031a91644de8e35af77835 /src/mapgen.cpp
parentc1b829077a3518f3a129eee11887b2358a53f20b (diff)
downloadminetest-4d77781ce7cba571701e731b1f442af691933720.tar.gz
minetest-4d77781ce7cba571701e731b1f442af691933720.tar.bz2
minetest-4d77781ce7cba571701e731b1f442af691933720.zip
A handful of minor fixes to various things
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp10
1 files changed, 4 insertions, 6 deletions
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)