Commit towards merge

src/Dodge/Tree/Shift.hs

@@ -34,9 +34,9 @@ posRms :: [ConvexPoly]
     -> [(Int,Tree RoomInt)]     -- the list of children, with indices
     -> Seq (Tree RoomInt)
     -> IO (Maybe [RoomInt])
-posRms bounds (parent,i) [] st = case st of
-    Empty                   -> return $ Just [(parent,i)]
-    Node childi ts :<| tseq -> fmap ((parent,i):) <$> posRms bounds childi (zipCount ts) tseq
+posRms bounds roomi [] st = case st of
+    Empty                   -> return $ Just [roomi]
+    Node nextroomi ts :<| tseq -> fmap (roomi:) <$> posRms bounds nextroomi (zipCount ts) tseq
 posRms bounds parenti@(parent,_) ( (numChild,t@(Node childi _) ):its) tseq = do
     printInfoCheckNum parenti numChild childi
     tryParentLinks outlinks