aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2017-01-02 18:54:24 +0100
committerorwell96 <orwell@bleipb.de>2017-01-02 18:54:24 +0100
commitcc6cf09ac83efa0bfaaecddb2a8fe49d136cca57 (patch)
treeaf7686bbbea8982739c145b5f88dfe4f50948aeb
parent79d0549c8af7eaa6ba97b8beaab52fb1012350f3 (diff)
downloadadvtrains-cc6cf09ac83efa0bfaaecddb2a8fe49d136cca57.tar.gz
advtrains-cc6cf09ac83efa0bfaaecddb2a8fe49d136cca57.tar.bz2
advtrains-cc6cf09ac83efa0bfaaecddb2a8fe49d136cca57.zip
make detector code clear entries of trains that do not exist
-rw-r--r--advtrains/tracks.lua32
1 files changed, 24 insertions, 8 deletions
diff --git a/advtrains/tracks.lua b/advtrains/tracks.lua
index 87998e9..07883c5 100644
--- a/advtrains/tracks.lua
+++ b/advtrains/tracks.lua
@@ -387,26 +387,42 @@ advtrains.detector.clean_step_before = false
function advtrains.detector.enter_node(pos, train_id)
local pts = minetest.pos_to_string(advtrains.round_vector_floor_y(pos))
print("enterNode "..pts.." "..sid(train_id))
- if not advtrains.detector.on_node[pts] then
- advtrains.detector.on_node[pts]=train_id
- if advtrains.detector.on_node_restore[pts] then
- advtrains.detector.on_node_restore[pts]=nil
+ if advtrains.detector.on_node[pts] then
+ if advtrains.trains[advtrains.detector.on_node[pts]] then
+ print(""..pts.." already occupied")
+ return false
else
- advtrains.detector.call_enter_callback(advtrains.round_vector_floor_y(pos), train_id)
+ advtrains.detector.leave_node(pos, advtrains.detector.on_node[pts])
end
+ end
+ advtrains.detector.on_node[pts]=train_id
+ if advtrains.detector.on_node_restore[pts] then
+ advtrains.detector.on_node_restore[pts]=nil
else
- print(""..pts.." already occupied")
+ advtrains.detector.call_enter_callback(advtrains.round_vector_floor_y(pos), train_id)
end
+ return true
end
function advtrains.detector.leave_node(pos, train_id)
local pts = minetest.pos_to_string(advtrains.round_vector_floor_y(pos))
print("leaveNode "..pts.." "..sid(train_id))
- if advtrains.detector.on_node[pts] and advtrains.detector.on_node[pts]==train_id then
+ if not advtrains.detector.on_node[pts] then
+ print(""..pts.." leave: nothing here")
+ return false
+ end
+ if advtrains.detector.on_node[pts]==train_id then
advtrains.detector.call_leave_callback(advtrains.round_vector_floor_y(pos), train_id)
advtrains.detector.on_node[pts]=nil
else
- print(""..pts.." occupied by another train")
+ if advtrains.trains[advtrains.detector.on_node[pts]] then
+ print(""..pts.." occupied by another train")
+ return false
+ else
+ advtrains.detector.leave_node(pos, advtrains.detector.on_node[pts])
+ return false
+ end
end
+ return true
end
--called immediately before invalidating paths
function advtrains.detector.setup_restore()