Introduce safeMinimumOn

src/Dodge/Render/Picture.hs

@@ -74,9 +74,6 @@ wallFloorsToDraw w = filter isVisible $ IM.elems $ wallsOnScreen w
         | wl ^? blVisible == Just False = False
         | otherwise = onScreen wl
 
-wallsOnScreen :: World -> IM.IntMap Wall
-wallsOnScreen w = wallsNearZones (zoneOfScreen w) w
-
 drawWallFloor :: Wall -> Picture
 drawWallFloor wl = if _wlIsSeeThrough wl
     then setDepth 0.9 . color c $ polygon [x,x +.+ n2,y+.+n2, y]
@@ -203,21 +200,25 @@ drawFFShadow w ff
                 , y]
 
 wallsPointsAndCols :: World -> [((Point2,Point2),Point4)]
-wallsPointsAndCols w = map f . filter (not . _wlIsSeeThrough) . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
+wallsPointsAndCols w 
+    = (map f . filter (not . _wlIsSeeThrough) . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w)
   where 
     f wl = (_wlLine wl, _wlColor wl)
 
+staticWallsOnScreen :: World -> [((Point2,Point2),Point4)]
+staticWallsOnScreen w 
+    = map f 
+    . concat 
+    $ catMaybes [IM.lookup x (_staticWalls w) >>= IM.lookup y | (x,y) <- zoneOfDoubleScreen w]
+  where
+    f wl = (_wlLine' wl, _wlColor' wl)
+
 wallsWindows :: World -> [((Point2,Point2),Point4)]
 wallsWindows w = map f . filter (fromMaybe True . (^? blVisible)) .
                      filter _wlIsSeeThrough . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
   where 
     f wl = (_wlLine wl, _wlColor wl)
 
-wallsForShadows :: World -> [(Point2,Point2)]
-wallsForShadows w = map _wlLine 
-                        . filter (not . _wlIsSeeThrough)
-                        . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
-
 lightsForGloom :: World -> [(Point3,Float,Float)]
 lightsForGloom w = map getLS (IM.elems $ _lightSources w) ++ map getTLS (_tempLightSources w)
   where