Rename functions, update API

diff --git a/game_api.txt b/game_api.txt
index b7d87616fb840bfe0776c28b1538468a77008d72..3d9d7a594359548b4e1345c5b9f3104c1b9e8c65 100644 (file)
--- a/game_api.txt
+++ b/game_api.txt
@@ -1,6 +1,6 @@
 minetest_game API
 ======================
-GitHub Repo: https://github.com/BlockMen/minetest_game
+GitHub Repo: https://github.com/minetest/minetest_game
 
 Introduction
 ------------
@@ -28,8 +28,7 @@ Doors API
 ---------
 The doors mod allows modders to register custom doors.
 
-       doors:register_door(name, def)
-       ^ Notice the ":" instaed of "."!
+       doors.register_door(name, def)
        ^ name: "Door name"
        ^ def: See [#Door definition]
        

diff --git a/mods/boats/init.lua b/mods/boats/init.lua
index cc38d420e32847f85c2f9b86d34da722d6088e91..3fb0b132ff26d0418e2013b89700dee906b72dea 100644 (file)
--- a/mods/boats/init.lua
+++ b/mods/boats/init.lua
@@ -42,7 +42,7 @@ local boat = {
        last_v = 0,
 }
 
-function boat:on_rightclick(clicker)
+function boat.on_rightclick(self, clicker)
        if not clicker or not clicker:is_player() then
                return
        end
@@ -63,7 +63,7 @@ function boat:on_rightclick(clicker)
        end
 end
 
-function boat:on_activate(staticdata, dtime_s)
+function boat.on_activate(self, staticdata, dtime_s)
        self.object:set_armor_groups({immortal=1})
        if staticdata then
                self.v = tonumber(staticdata)
@@ -71,11 +71,11 @@ function boat:on_activate(staticdata, dtime_s)
        self.last_v = self.v
 end
 
-function boat:get_staticdata()
+function boat.get_staticdata()
        return tostring(v)
 end
 
-function boat:on_punch(puncher, time_from_last_punch, tool_capabilities, direction)
+function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, direction)
        puncher:set_detach()
        self.object:remove()
        if puncher and puncher:is_player() and not minetest.setting_getbool("creative_mode") then
@@ -83,7 +83,7 @@ function boat:on_punch(puncher, time_from_last_punch, tool_capabilities, directi
        end
 end
 
-function boat:on_step(dtime)
+function boat.on_step(self, dtime)
        self.v = get_v(self.object:getvelocity())*get_sign(self.v)
        if self.driver then
                local ctrl = self.driver:get_player_control()

diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index 44e2aa445ed5a7f1df52be3d4cc492dc909ccca4..87b15b61963aee6cf6e47411cd3d2a3b796a9ce4 100644 (file)
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -28,7 +28,7 @@ local function is_right(pos)
        end
 end
 
-function doors:register_door(name, def)
+function doors.register_door(name, def)
        def.groups.not_in_creative_inventory = 1
 
        local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5+1.5/16}}
@@ -291,7 +291,7 @@ function doors:register_door(name, def)
 
 end
 
-doors:register_door("doors:door_wood", {
+doors.register_door("doors:door_wood", {
        description = "Wooden Door",
        inventory_image = "door_wood.png",
        groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -310,7 +310,7 @@ minetest.register_craft({
        }
 })
 
-doors:register_door("doors:door_steel", {
+doors.register_door("doors:door_steel", {
        description = "Steel Door",
        inventory_image = "door_steel.png",
        groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
@@ -330,7 +330,7 @@ minetest.register_craft({
        }
 })
 
-doors:register_door("doors:door_glass", {
+doors.register_door("doors:door_glass", {
        description = "Glass Door",
        inventory_image = "door_glass.png",
        groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},
@@ -349,7 +349,7 @@ minetest.register_craft({
        }
 })
 
-doors:register_door("doors:door_obsidian_glass", {
+doors.register_door("doors:door_obsidian_glass", {
        description = "Obsidian Glass Door",
        inventory_image = "door_obsidian_glass.png",
        groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},