mapgen: drop mapgen id from child mapgens.

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

diff --git a/src/mapgen/mg_schematic.cpp b/src/mapgen/mg_schematic.cpp
index fc77194ac7bab6c3646dd6a15b3d9ee65f39ba0b..36f1dd76b3b6fe5aa63232aab3ac21c47d0b3d14 100644 (file)
--- a/src/mapgen/mg_schematic.cpp
+++ b/src/mapgen/mg_schematic.cpp
@@ -137,8 +137,8 @@ void Schematic::blitToVManip(MMVManip *vm, v3s16 p, Rotation rot, bool force_pla
                for (s16 z = 0; z != sz; z++) {
                        u32 i = z * i_step_z + y * ystride + i_start;
                        for (s16 x = 0; x != sx; x++, i += i_step_x) {
-                               u32 vi = vm->m_area.index(p.X + x, y_map, p.Z + z);
-                               if (!vm->m_area.contains(vi))
+                               v3s16 pos(p.X + x, y_map, p.Z + z);
+                               if (!vm->m_area.contains(pos))
                                        continue;
 
                                if (schemdata[i].getContent() == CONTENT_IGNORE)
@@ -150,6 +150,7 @@ void Schematic::blitToVManip(MMVManip *vm, v3s16 p, Rotation rot, bool force_pla
                                if (placement_prob == MTSCHEM_PROB_NEVER)
                                        continue;
 
+                               u32 vi = vm->m_area.index(pos);
                                if (!force_place && !force_place_node) {
                                        content_t c = vm->m_data[vi].getContent();
                                        if (c != CONTENT_AIR && c != CONTENT_IGNORE)
@@ -188,15 +189,15 @@ bool Schematic::placeOnVManip(MMVManip *vm, v3s16 p, u32 flags,
 
        //// Adjust placement position if necessary
        if (flags & DECO_PLACE_CENTER_X)
-               p.X -= (s.X + 1) / 2;
+               p.X -= (s.X - 1) / 2;
        if (flags & DECO_PLACE_CENTER_Y)
-               p.Y -= (s.Y + 1) / 2;
+               p.Y -= (s.Y - 1) / 2;
        if (flags & DECO_PLACE_CENTER_Z)
-               p.Z -= (s.Z + 1) / 2;
+               p.Z -= (s.Z - 1) / 2;
 
        blitToVManip(vm, p, rot, force_place);
 
-       return vm->m_area.contains(VoxelArea(p, p + s - v3s16(1,1,1)));
+       return vm->m_area.contains(VoxelArea(p, p + s - v3s16(1, 1, 1)));
 }
 
 void Schematic::placeOnMap(ServerMap *map, v3s16 p, u32 flags,
@@ -219,16 +220,16 @@ void Schematic::placeOnMap(ServerMap *map, v3s16 p, u32 flags,
 
        //// Adjust placement position if necessary
        if (flags & DECO_PLACE_CENTER_X)
-               p.X -= (s.X + 1) / 2;
+               p.X -= (s.X - 1) / 2;
        if (flags & DECO_PLACE_CENTER_Y)
-               p.Y -= (s.Y + 1) / 2;
+               p.Y -= (s.Y - 1) / 2;
        if (flags & DECO_PLACE_CENTER_Z)
-               p.Z -= (s.Z + 1) / 2;
+               p.Z -= (s.Z - 1) / 2;
 
        //// Create VManip for effected area, emerge our area, modify area
        //// inside VManip, then blit back.
        v3s16 bp1 = getNodeBlockPos(p);
-       v3s16 bp2 = getNodeBlockPos(p + s - v3s16(1,1,1));
+       v3s16 bp2 = getNodeBlockPos(p + s - v3s16(1, 1, 1));
 
        MMVManip vm(map);
        vm.initialEmerge(bp1, bp2);