diff code/grid.lm @ 57:a3e4d2833301

Merge
author Michael Pavone <pavone@retrodev.com>
date Sun, 27 Jul 2014 19:53:08 -0700
parents 57a4bddadd46
children d087d0b28039
line wrap: on
line diff
--- a/code/grid.lm	Sun Jul 27 19:52:30 2014 -0700
+++ b/code/grid.lm	Sun Jul 27 19:53:08 2014 -0700
@@ -39,11 +39,15 @@
 		grid: grid update: pos with: :el { val }
 	}
 
+	gridMaxY <- :grid {grid value}
+	gridMaxX <- :grid {(get: 0 fromTree: grid) value}
+	gridArea <- :grid {(grid gridMaxX) * (grid gridMaxY)}
+
 	grid:inBounds? <- :grid :pos {
 		x <- pos value
 		y <- pos tail
-		maxY <- grid value
-		maxX <- (get: 0 fromTree: grid) value
+		maxY <- (grid gridMaxY)
+		maxX <- (grid gridMaxX)
 		((x >= 0) + (y >= 0) + (x < maxX) + (y < maxY)) > 0
 	}