summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian <Christian_D_97@gmx.de>2015-02-21 22:52:21 +0100
committerChristian <Christian_D_97@gmx.de>2015-02-21 22:52:21 +0100
commit5be7aec758b23dc1773520abd0ee450b361979b6 (patch)
treee29ecb40f0260110a1aefae3e7121a2455bfc4c7
parent94f199a96610927713e76b2aa024b4a970c47917 (diff)
parent4a583b811ba32bfe4709e8ae0bcf8cef31986472 (diff)
downloadroads-5be7aec758b23dc1773520abd0ee450b361979b6.tar
roads-5be7aec758b23dc1773520abd0ee450b361979b6.tar.gz
roads-5be7aec758b23dc1773520abd0ee450b361979b6.tar.bz2
roads-5be7aec758b23dc1773520abd0ee450b361979b6.tar.xz
roads-5be7aec758b23dc1773520abd0ee450b361979b6.zip
Merge pull request #41 from HybridDog/globalfixes
thank you. I don't have the time to work on this mod within the next months, so I'm glad that you create some PRs to fix bugs :)
-rw-r--r--asphaltstairs/init.lua5
-rw-r--r--concretestairs/init.lua3
2 files changed, 5 insertions, 3 deletions
diff --git a/asphaltstairs/init.lua b/asphaltstairs/init.lua
index 1ac3de8..f2cfb14 100644
--- a/asphaltstairs/init.lua
+++ b/asphaltstairs/init.lua
@@ -1,7 +1,8 @@
--[[
StreetsMod: Asphalt stairs
]]
-if type(register_stair_slab_panel_micro) ~= "function" then return end
+if not rawget(_G, "register_stair_slab_panel_micro")
+or type(register_stair_slab_panel_micro) ~= "function" then return end
-- Asphalt
register_stair_slab_panel_micro("streets", "asphalt", "streets:asphalt", {cracky=3}, {"streets_asphalt.png"}, "Asphalt", "asphalt", nil)
minetest.register_alias("streets:asphalt_stair","stairs:stair_asphalt")
@@ -224,4 +225,4 @@ if type(register_stair_slab_panel_micro) ~= "function" then return end
type = "shapeless",
output = "streets:asphalt_side_l",
recipe = {"streets:asphalt_side_r"}
- }) \ No newline at end of file
+ })
diff --git a/concretestairs/init.lua b/concretestairs/init.lua
index a0ad99d..f6400c5 100644
--- a/concretestairs/init.lua
+++ b/concretestairs/init.lua
@@ -1,7 +1,8 @@
--[[
StreetsMod: Concrete stairs (compatible to circular saw)
]]
-if type(register_stair_slab_panel_micro) == "function" and streets.extendedBy.prefab == false then
+if rawget(_G, "register_stair_slab_panel_micro")
+and type(register_stair_slab_panel_micro) == "function" and streets.extendedBy.prefab == false then
register_stair_slab_panel_micro("streets", "concrete", "streets:concrete", {cracky=2}, {"streets_concrete.png"}, "Concrete", "concrete", nil)
table.insert(circular_saw.known_stairs,"streets:concrete")
minetest.register_alias("stairs:stair_concrete","streets:stair_concrete")