Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Anthony Zhang 2013-06-22 15:39:01 -04:00
commit ec63bd3abf
2 changed files with 13 additions and 4 deletions

@ -380,10 +380,12 @@ end
-- ______ -- ______
-- | -- |
-- | | | -- |
-- |___| | __ ___ _ __ _ _ -- | __ ___ _ __ _ _
-- | | | | |\ | | |_| | | | | |_ |_| -- | | | | | |\ | | |_| | | | | |_ |_|
-- | |______ |__| | \| | | \ |__| |_ |_ |_ |\ -- |___| |______ |__| | \| | | \ |__| |_ |_ |_ |\
-- |
-- |
-- --
----------------------- -----------------------

@ -94,6 +94,11 @@ function mesecon:mvps_push(pos, dir, maximum) -- pos: pos of mvps; dir: directio
nodes[i].pos = mesecon:addPosRule(nodes[i].pos, dir) nodes[i].pos = mesecon:addPosRule(nodes[i].pos, dir)
end end
for _, n in ipairs(nodes) do
mesecon.on_placenode(n.pos, n.node)
mesecon:update_autoconnect(n.pos)
end
return true, nodes, oldstack return true, nodes, oldstack
end end
@ -112,6 +117,8 @@ function mesecon:mvps_pull_single(pos, dir) -- pos: pos of mvps; direction: dire
nodeupdate(pos) nodeupdate(pos)
mesecon.on_dignode(np, nn) mesecon.on_dignode(np, nn)
mesecon:update_autoconnect(np) mesecon:update_autoconnect(np)
mesecon:update_autoconnect(pos)
mesecon.on_placenode(pos, nn)
end end
return {{pos = np, node = {param2 = 0, name = "air"}}, {pos = pos, node = nn}} return {{pos = np, node = {param2 = 0, name = "air"}}, {pos = pos, node = nn}}
end end