Change the ENABLE_TEMPEREST flag to affect only the inclusion of the inverter socket, since that is the only element that can lead to a crash.

This commit is contained in:
Anthony Zhang 2012-02-23 19:43:03 -05:00
parent cbd77d8f3d
commit 8bdb2e86ad
2 changed files with 96 additions and 75 deletions

@ -877,10 +877,7 @@ dofile(minetest.get_modpath("jeija").."/switch.lua")
dofile(minetest.get_modpath("jeija").."/pistons.lua") dofile(minetest.get_modpath("jeija").."/pistons.lua")
dofile(minetest.get_modpath("jeija").."/lightstone.lua") dofile(minetest.get_modpath("jeija").."/lightstone.lua")
dofile(minetest.get_modpath("jeija").."/lever.lua") dofile(minetest.get_modpath("jeija").."/lever.lua")
--TEMPEREST's STUFF
if ENABLE_TEMPEREST==1 then
dofile(minetest.get_modpath("jeija").."/temperest.lua") dofile(minetest.get_modpath("jeija").."/temperest.lua")
end
--INIT --INIT
mesecon:read_wlre_from_file() mesecon:read_wlre_from_file()

@ -15,7 +15,11 @@ minetest.register_node("jeija:mesecon_plug", {
description = "Plug", description = "Plug",
}) })
local set_node_on = function(pos) local set_node_on
local set_node_off
if ENABLE_TEMPEREST==1 then
set_node_on = function(pos)
local node = minetest.env:get_node(pos) local node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_off" then if node.name=="jeija:mesecon_socket_off" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"}) minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"})
@ -28,7 +32,7 @@ local set_node_on = function(pos)
end end
end end
local set_node_off = function(pos) set_node_off = function(pos)
node = minetest.env:get_node(pos) node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_on" then if node.name=="jeija:mesecon_socket_on" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"}) minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"})
@ -40,6 +44,25 @@ local set_node_off = function(pos)
mesecon:receptor_on(pos) mesecon:receptor_on(pos)
end end
end end
else
set_node_on = function(pos)
local node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_off" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_on"})
nodeupdate(pos)
mesecon:receptor_on(pos)
end
end
set_node_off = function(pos)
node = minetest.env:get_node(pos)
if node.name=="jeija:mesecon_socket_on" then
minetest.env:add_node(pos, {name="jeija:mesecon_socket_off"})
nodeupdate(pos)
mesecon:receptor_off(pos)
end
end
end
local plug_on = function(pos, node) local plug_on = function(pos, node)
if node.name=="jeija:mesecon_plug" then if node.name=="jeija:mesecon_plug" then
@ -139,7 +162,7 @@ minetest.register_craft({
}) })
--TEMPEREST-INVERTER --TEMPEREST-INVERTER
if ENABLE_TEMPEREST==1 then
minetest.register_node("jeija:mesecon_inverter_off", { minetest.register_node("jeija:mesecon_inverter_off", {
drawtype = "raillike", drawtype = "raillike",
paramtype = "light", paramtype = "light",
@ -194,3 +217,4 @@ minetest.register_craft({
{'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'}, {'node "jeija:mesecon_off"', 'craft "default:steel_ingot"', 'node "jeija:mesecon_off"'},
} }
}) })
end