Extract matrixMapWithIndex function

chendrix · Jun 19, 2015 · cd01b83 · cd01b83
1 parent 2d2fb5a
commit cd01b83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/Rogue/Model.elm b/src/Rogue/Model.elm
@@ -49,6 +49,15 @@ gameMap : Int -> Player -> GameMap
 gameMap size p = 
   newBoardWithBarriersAt size (randomizeLocationsWithin size 11) p
 
+matrixMapWithIndex : (Location -> a -> b) -> Array (Array a) -> Array (Array b)
+matrixMapWithIndex f m =
+  Array.indexedMap (
+    \rowNum row -> Array.indexedMap (
+      \colNum cell -> 
+        f (rowNum, colNum) cell
+    ) row
+  ) m 
+
 defaultGame : Game
 defaultGame =
   let
@@ -63,12 +72,9 @@ currentPlayerLocation : GameMap -> Maybe Location
 currentPlayerLocation gameMap =
   let
     matrixOfLocAndHasPlayer =
-      Array.indexedMap (
-        \rowNum row ->
-          Array.indexedMap (
-            \colNum cell -> ((rowNum,colNum), doesContainPlayer cell)
-          ) row
-        ) gameMap
+      matrixMapWithIndex (
+        \loc cell -> (loc, doesContainPlayer cell)
+      ) gameMap
   in
     Array.map toList matrixOfLocAndHasPlayer
     |> toList

diff --git a/src/Rogue/Update.elm b/src/Rogue/Update.elm
@@ -21,13 +21,11 @@ updateGameMap {dir} p gameMap =
 
 updateBoard : Player -> GameMap -> Location -> GameMap
 updateBoard p gameMap newPlayerLoc =
-  Array.indexedMap (
-    \rowNum row -> Array.indexedMap (
-      \colNum cell -> 
+  matrixMapWithIndex (
+      \(rowNum,colNum) cell -> 
         if  | (rowNum, colNum) == newPlayerLoc -> insertPerson p cell
             | otherwise -> clearCell cell
-        ) row
-  ) gameMap
+    ) gameMap
 
 insertPerson : Player -> Cell -> Cell
 insertPerson p c =