summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-09-30 23:55:16 +0100
committerthetaepsilon-gamedev <thetaepsilon-gamedev@noreply.users.github.com>2017-09-30 23:55:16 +0100
commit21892456f529e099a0c1d47ae780101d172f818a (patch)
tree2eb41cc9f6efb8a37475b1b4271aeb07ec86da06
parentc3627551b091d27819c242da204ed1e9dd8f15f0 (diff)
downloadpipeworks-21892456f529e099a0c1d47ae780101d172f818a.tar
pipeworks-21892456f529e099a0c1d47ae780101d172f818a.tar.gz
pipeworks-21892456f529e099a0c1d47ae780101d172f818a.tar.bz2
pipeworks-21892456f529e099a0c1d47ae780101d172f818a.tar.xz
pipeworks-21892456f529e099a0c1d47ae780101d172f818a.zip
init.lua: move non-destructive new_flow_logic code outside if-guard
-rw-r--r--init.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/init.lua b/init.lua
index a081759..d6067e5 100644
--- a/init.lua
+++ b/init.lua
@@ -116,7 +116,10 @@ dofile(pipeworks.modpath.."/trashcan.lua")
dofile(pipeworks.modpath.."/wielder.lua")
local logicdir = "/new_flow_logic/"
--- note that pipes still don't appear until registered in the files below this one, so can still be turned off
+
+-- note that even with these files the new flow logic is not yet default
+dofile(pipeworks.modpath..logicdir.."abms.lua")
+dofile(pipeworks.modpath..logicdir.."abm_register.lua")
dofile(pipeworks.modpath..logicdir.."flowable_node_registry.lua")
if pipeworks.enable_pipes then dofile(pipeworks.modpath.."/pipes.lua") end
@@ -124,8 +127,6 @@ if pipeworks.enable_teleport_tube then dofile(pipeworks.modpath.."/teleport_tube
if pipeworks.enable_pipe_devices then dofile(pipeworks.modpath.."/devices.lua") end
-- individual enable flags also checked in register_local_pipes.lua
if pipeworks.enable_new_flow_logic then
- dofile(pipeworks.modpath..logicdir.."abms.lua")
- dofile(pipeworks.modpath..logicdir.."abm_register.lua")
dofile(pipeworks.modpath..logicdir.."register_local_pipes.lua")
end