Move worldedit.marker_update

[worldedit.git] / worldedit_commands / mark.lua

diff --git a/worldedit_commands/mark.lua b/worldedit_commands/mark.lua
index cb45075c48848a6bdfc90c07107fec5d3e9d765f..874999d4949227fdc802dadf67e2090f291f7c26 100644 (file)
--- a/worldedit_commands/mark.lua
+++ b/worldedit_commands/mark.lua
@@ -3,7 +3,7 @@ worldedit.marker2 = {}
 worldedit.marker_region = {}\r
 \r
 --marks worldedit region position 1\r
-worldedit.mark_pos1 = function(name)\r
+worldedit.mark_pos1 = function(name, region_too)\r
        local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
 \r
        if pos1 ~= nil then\r
@@ -22,11 +22,13 @@ worldedit.mark_pos1 = function(name)
                        worldedit.marker1[name]:get_luaentity().player_name = name\r
                end\r
        end\r
-       worldedit.mark_region(name)\r
+       if region_too == nil or region_too then\r
+               worldedit.mark_region(name)\r
+       end\r
 end\r
 \r
 --marks worldedit region position 2\r
-worldedit.mark_pos2 = function(name)\r
+worldedit.mark_pos2 = function(name, region_too)\r
        local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
 \r
        if pos2 ~= nil then\r
@@ -45,7 +47,9 @@ worldedit.mark_pos2 = function(name)
                        worldedit.marker2[name]:get_luaentity().player_name = name\r
                end\r
        end\r
-       worldedit.mark_region(name)\r
+       if region_too == nil or region_too then\r
+               worldedit.mark_region(name)\r
+       end\r
 end\r
 \r
 worldedit.mark_region = function(name)\r
@@ -111,6 +115,13 @@ worldedit.mark_region = function(name)
        end\r
 end\r
 \r
+--convenience function that calls everything\r
+worldedit.marker_update = function(name)\r
+       worldedit.mark_pos1(name, false)\r
+       worldedit.mark_pos2(name, false)\r
+       worldedit.mark_region(name)\r
+end\r
+\r
 minetest.register_entity(":worldedit:pos1", {\r
        initial_properties = {\r
                visual = "cube",\r