Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/mg_schematic.cpp b/src/mg_schematic.cpp
index 3d08d86fa13cc5398cf98ab347c804134066fdee..67931497f34a7e565c3aa5540e89cf037f184c62 100644 (file)
--- a/src/mg_schematic.cpp
+++ b/src/mg_schematic.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2015-2017 paramat
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -30,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/serialize.h"
 #include "serialization.h"
 #include "filesys.h"
+#include "voxelalgorithms.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -202,7 +204,7 @@ bool Schematic::placeOnVManip(MMVManip *vm, v3s16 p, u32 flags,
        return vm->m_area.contains(VoxelArea(p, p + s - v3s16(1,1,1)));
 }
 
-void Schematic::placeOnMap(Map *map, v3s16 p, u32 flags,
+void Schematic::placeOnMap(ServerMap *map, v3s16 p, u32 flags,
        Rotation rot, bool force_place)
 {
        std::map<v3s16, MapBlock *> lighting_modified_blocks;
@@ -238,15 +240,10 @@ void Schematic::placeOnMap(Map *map, v3s16 p, u32 flags,
 
        blitToVManip(&vm, p, rot, force_place);
 
-       vm.blitBackAll(&modified_blocks);
+       voxalgo::blit_back_with_light(map, &vm, &modified_blocks);
 
        //// Carry out post-map-modification actions
 
-       //// Update lighting
-       // TODO: Optimize this by using Mapgen::calcLighting() instead
-       lighting_modified_blocks.insert(modified_blocks.begin(), modified_blocks.end());
-       map->updateLighting(lighting_modified_blocks, modified_blocks);
-
        //// Create & dispatch map modification events to observers
        MapEditEvent event;
        event.type = MEET_OTHER;