Merge remote-tracking branch 'upstream/master'HEADmaster

Resolved conflicts by reordering of files

1 files changed, 31 insertions, 4 deletions

diff --git a/signs/compatibility.lua b/signs/compatibility.lua
index 3284230..dea8750 100644
--- a/signs/compatibility.lua
+++ b/signs/compatibility.lua
@@ -23,7 +23,7 @@
 ------------------------------------
 
 local wallmounted_to_facedir = {
-  [0]=1, -- Should not happend with signs 
+  [0]=1, -- Should not happend with signs
   [1]=1, -- Should not happend with signs
   [2]=1,
   [3]=3,
@@ -43,9 +43,9 @@ local function compatibility_check_1(pos, node)
     node.name = convert_nodes[node.name]
     if node.name then
 	  node.param2 = wallmounted_to_facedir[node.param2]
-      display_lib.on_destruct(pos)
+      display_api.on_destruct(pos)
       minetest.swap_node(pos, node)
-      display_lib.on_construct(pos)
+      display_api.on_construct(pos)
     end
 end
 
@@ -76,7 +76,7 @@ local function compatibility_check_2(pos, node)
 		end
 	end
 	-- Create new entity
-	display_lib.update_entities(pos)
+	display_api.update_entities(pos)
 end
 
 minetest.register_lbm({ name = "signs:conpatibility_2",
@@ -84,7 +84,34 @@ minetest.register_lbm({ name = "signs:conpatibility_2",
 	action = compatibility_check_2,
 })
 
+--Backwards compatibility API functions
 
+signs.set_display_text = function(...)
+	minetest.log("warning", "signs.set_display_text() is deprecated, please use signs_api.set_display_text() instead.")
+	return signs_api.set_display_text(...)
+end
+
+signs.set_formspec = function(...)
+	minetest.log("warning", "signs.set_formspec() is deprecated, please use signs_api.set_formspec() instead.")
+	return  signs_api.set_formspec(...)
+end
+
+signs.on_receive_fields = function(...)
+	minetest.log("warning", "signs.on_receive_fields() is deprecated, please use signs_api.on_receive_fields() instead.")
+	return  signs_api.on_receive_fields(...)
+end
 
+signs.on_place_direction = function(...)
+	minetest.log("warning", "signs.on_place_direction() is deprecated, please use signs_api.on_place_direction() instead.")
+	return  signs_api.on_place_direction(...)
+end
 
+signs.on_rotate = function(...)
+	minetest.log("warning", "signs.on_rotate() is deprecated, please use signs_api.on_rotate() instead.")
+	return  signs_api.on_rotate(...)
+end
 
+signs.register_sign = function(...)
+	minetest.log("warning", "signs.register_sign() is deprecated, please use signs_api.register_sign() instead.")
+	return  signs_api.register_sign(...)
+end