From 59ac9780939b9c130bb70034bccb04ff1e99136d Mon Sep 17 00:00:00 2001 From: thetaepsilon-gamedev Date: Wed, 27 Sep 2017 15:19:20 +0100 Subject: pipes.lua: place old ABM code registration behind if-guard for new flag --- init.lua | 3 +++ pipes.lua | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/init.lua b/init.lua index 2e05337..5094a13 100644 --- a/init.lua +++ b/init.lua @@ -111,6 +111,9 @@ dofile(pipeworks.modpath.."/filter-injector.lua") dofile(pipeworks.modpath.."/trashcan.lua") dofile(pipeworks.modpath.."/wielder.lua") +-- temporary flag to enable new flowing behaviour +pipeworks.enable_new_flow_logic = true + if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube.lua") end if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end diff --git a/pipes.lua b/pipes.lua index 5a48801..29f91d3 100644 --- a/pipes.lua +++ b/pipes.lua @@ -191,6 +191,13 @@ table.insert(pipes_full_nodenames,"pipeworks:valve_on_loaded") table.insert(pipes_full_nodenames,"pipeworks:entry_panel_loaded") table.insert(pipes_full_nodenames,"pipeworks:flow_sensor_loaded") + + + +if not pipeworks.enable_new_flow_logic then +-- sorry, no indents... it messes with the patchlogs too much + + minetest.register_abm({ nodenames = pipes_empty_nodenames, interval = 1, @@ -228,6 +235,9 @@ minetest.register_abm({ }) +else + + -- run pressure balancing ABM over all water-moving nodes local pipes_all_nodenames = pipes_full_nodenames for _, pipe in ipairs(pipes_empty_nodenames) do @@ -241,3 +251,7 @@ minetest.register_abm({ pipeworks.balance_pressure(pos, node) end }) + + + +end \ No newline at end of file -- cgit v1.2.3