Fix several typos

diff --git a/worldedit_commands/cuboid.lua b/worldedit_commands/cuboid.lua
index 9d6d86a65dcfdbd3fb37251a73fec433ce53a64b..35f2bfcd3278a8ef4e24a65db2046822581e18cd 100644 (file)
--- a/worldedit_commands/cuboid.lua
+++ b/worldedit_commands/cuboid.lua
@@ -1,3 +1,6 @@
+dofile(minetest.get_modpath("worldedit_commands") .. "/cuboidapi.lua")
+
+
 minetest.register_chatcommand("/outset", {
        params = "<amount> [h|v]",
        description = "outset the selection",
@@ -18,15 +21,15 @@ minetest.register_chatcommand("/outset", {
                end
                
                if dir == "" then
-                       assert(worldedit.cuboid_volumetricexpand(name, amount))
+                       assert(worldedit.cuboid_volumetric_expand(name, amount))
                elseif dir == "h" then
-                       assert(worldedit.cuboid_linealexpand(name, 'x', 1, amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'x', -1, amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'z', 1, amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'z', -1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'x', 1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'x', -1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'z', 1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'z', -1, amount))
                elseif dir == "v" then
-                       assert(worldedit.cuboid_linealexpand(name, 'y', 1, amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'y', -1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'y', 1, amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'y', -1, amount))
                else
                        return false, "Unknown error"
                end
@@ -37,6 +40,7 @@ minetest.register_chatcommand("/outset", {
   }
 )
 
+
 minetest.register_chatcommand("/inset", {
        params = "<amount> [h|v]",
        description = "inset the selection",
@@ -57,15 +61,15 @@ minetest.register_chatcommand("/inset", {
                end
                
                if dir == "" then
-                       assert(worldedit.cuboid_volumetricexpand(name, -amount))
+                       assert(worldedit.cuboid_volumetric_expand(name, -amount))
                elseif dir == "h" then
-                       assert(worldedit.cuboid_linealexpand(name, 'x', 1, -amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'x', -1, -amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'z', 1, -amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'z', -1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'x', 1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'x', -1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'z', 1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'z', -1, -amount))
                elseif dir == "v" then
-                       assert(worldedit.cuboid_linealexpand(name, 'y', 1, -amount))
-                       assert(worldedit.cuboid_linealexpand(name, 'y', -1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'y', 1, -amount))
+                       assert(worldedit.cuboid_linear_expand(name, 'y', -1, -amount))
                else
                        return false, "Unknown error"
                end
@@ -93,7 +97,7 @@ minetest.register_chatcommand("/shift", {
                
                if pos1 == nil or pos2 == nil then
                        worldedit.player_notify(name, 
-                       "Undefined region. Region must be defined beforehand.")
+                               "Undefined region. Region must be defined beforehand.")
                        return
                end
                
@@ -102,17 +106,17 @@ minetest.register_chatcommand("/shift", {
                        axis, dir = worldedit.translate_direction(name, direction)
                else
                        axis, dir = worldedit.player_axis(name)
-                       worldedit.player_notify(name, "entered player_axis")
                end
                
                assert(worldedit.cuboid_shift(name, axis, amount * dir))
                worldedit.marker_update(name)
                
-               return true, "region shifted by " .. amount .. " blocks"
+               return true, "region shifted by " .. amount .. " nodes"
       end,
   }
 )
 
+
 minetest.register_chatcommand("/expand", {
        params = "<amount> [reverse-amount] [up|down|left|right|front|back]",
        description = "expand the selection in one or two directions at once",
@@ -133,7 +137,7 @@ minetest.register_chatcommand("/expand", {
        
        local tmp = tonumber(arg2)
        local axis, dir
-       local reverseamount = 0
+       local reverse_amount = 0
        
        axis,dir = worldedit.player_axis(name)
        
@@ -141,7 +145,7 @@ minetest.register_chatcommand("/expand", {
                if tmp == nil then
                        axis, dir = worldedit.translate_direction(name, arg2)
                else
-                       reverseamount = tmp
+                       reverse_amount = tmp
                end
        end
        
@@ -149,8 +153,8 @@ minetest.register_chatcommand("/expand", {
                axis, dir = worldedit.translate_direction(name, arg3)
        end
        
-       worldedit.cuboid_linealexpand(name, axis, dir, amount)
-       worldedit.cuboid_linealexpand(name, axis, -dir, reverseamount)
+       worldedit.cuboid_linear_expand(name, axis, dir, amount)
+       worldedit.cuboid_linear_expand(name, axis, -dir, reverse_amount)
        worldedit.marker_update(name)
       end,
   }
@@ -177,7 +181,7 @@ minetest.register_chatcommand("/contract", {
        
        local tmp = tonumber(arg2)
        local axis, dir
-       local reverseamount = 0
+       local reverse_amount = 0
        
        axis,dir = worldedit.player_axis(name)
        
@@ -185,7 +189,7 @@ minetest.register_chatcommand("/contract", {
                if tmp == nil then
                        axis, dir = worldedit.translate_direction(name, arg2)
                else
-                       reverseamount = tmp
+                       reverse_amount = tmp
                end
        end
        
@@ -193,13 +197,9 @@ minetest.register_chatcommand("/contract", {
                axis, dir = worldedit.translate_direction(name, arg3)
        end
        
-       worldedit.cuboid_linealexpand(name, axis, dir, -amount)
-       worldedit.cuboid_linealexpand(name, axis, -dir, -reverseamount)
+       worldedit.cuboid_linear_expand(name, axis, dir, -amount)
+       worldedit.cuboid_linear_expand(name, axis, -dir, -reverse_amount)
        worldedit.marker_update(name)
       end,
   }
-)
-
-
-dofile(minetest.get_modpath("worldedit_commands") .. "/cuboidapi.lua")
-
+)
\ No newline at end of file

diff --git a/worldedit_commands/cuboidapi.lua b/worldedit_commands/cuboidapi.lua
index d473571decf0f99fe53373b0b3b902d6b30a48e6..08b364ace3d2fcb054df90338e3e20528f45d4c1 100644 (file)
--- a/worldedit_commands/cuboidapi.lua
+++ b/worldedit_commands/cuboidapi.lua
@@ -1,5 +1,5 @@
 -- Expands or contracts the cuboid in all axes by amount (positive or negative)
-worldedit.cuboid_volumetricexpand = function(name, amount)
+worldedit.cuboid_volumetric_expand = function(name, amount)
        local pos1 = worldedit.pos1[name]
        local pos2 = worldedit.pos2[name]
        
@@ -9,14 +9,14 @@ worldedit.cuboid_volumetricexpand = function(name, amount)
        
        local delta1 = vector.new()
        local delta2 = vector.new()
-       local deltadir1
-       local deltadir2
+       local delta_dir1
+       local delta_dir2
        
        delta1 = vector.add(delta1, amount)
        delta2 = vector.add(delta2, amount)
-       deltadir1, deltadir2 = worldedit.get_expansion_directions(pos1, pos2)
-       delta1 = vector.multiply(delta1, deltadir1)
-       delta2 = vector.multiply(delta2, deltadir2)
+       delta_dir1, delta_dir2 = worldedit.get_expansion_directions(pos1, pos2)
+       delta1 = vector.multiply(delta1, delta_dir1)
+       delta2 = vector.multiply(delta2, delta_dir2)
        worldedit.pos1[name] = vector.add(pos1, delta1)
        worldedit.pos2[name] = vector.add(pos2, delta2)
        
@@ -25,7 +25,7 @@ end
 
 
 -- Expands or contracts the cuboid in a single axis by amount (positive or negative)
-worldedit.cuboid_linealexpand = function(name, axis, direction, amount)
+worldedit.cuboid_linear_expand = function(name, axis, direction, amount)
        local pos1 = worldedit.pos1[name]
        local pos2 = worldedit.pos2[name]
        

diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 21a6af345b35d7a505d36c5a918484cd74315e8f..eedc3721bdbccb44f8f985b4c7304b92e70638c0 100644 (file)
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -10,6 +10,7 @@ if minetest.place_schematic then
        worldedit.prob_list = {}\r
 end\r
 \r
+dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")\r
 dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")\r
 local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")\r
 \r
@@ -1181,6 +1182,4 @@ minetest.register_chatcommand("/clearobjects", {
                local count = worldedit.clear_objects(worldedit.pos1[name], worldedit.pos2[name])\r
                worldedit.player_notify(name, count .. " objects cleared")\r
        end),\r
-})\r
-\r
-dofile(minetest.get_modpath("worldedit_commands") .. "/cuboid.lua")\r
+})
\ No newline at end of file