Refactor wall points from lists to pairs

src/Dodge/Render/HUD.hs

@@ -101,7 +101,7 @@ mapWall w wl =
     t = normalizeV (y -.- x)
 --    n2 = 2 *.* vNormal t
     n2 = 20 *.* vNormal t
-    (x:y:_) = _wlLine wl
+    (x,y) = _wlLine wl
     c = _wlColor wl
 
 {- | Pictures of popup text for items close to your position.-}

src/Dodge/Render/Picture.hs

@@ -61,7 +61,7 @@ clDraw c = uncurry translate (_clPos c) (_clPict c c)
 wallFloorsToDraw :: World -> [Wall]
 wallFloorsToDraw w = filter isVisible $ IM.elems $ wallsOnScreen w
   where 
-    onScreen wall = lineOnScreen w (_wlLine wall)
+    onScreen wall = lineOnScreen w ((\(a,b) -> [a,b]) $ _wlLine wall)
     isVisible wl 
         | wl ^? blVisible == Just False = False
         | otherwise = onScreen wl
@@ -71,12 +71,12 @@ 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]
-                   else blank
-    where 
-        (x:y:_) = _wlLine wl
-        c = _wlColor wl
-        n2 = 15 *.* (vNormal . errorNormalizeVDR $ y -.- x)
+    then setDepth 0.9 . color c $ polygon [x,x +.+ n2,y+.+n2, y]
+    else blank
+  where 
+    (x,y) = _wlLine wl
+    c = _wlColor wl
+    n2 = 15 *.* (vNormal . errorNormalizeVDR $ y -.- x)
 
 errorNormalizeVDR :: Point2 -> Point2
 errorNormalizeVDR (0,0) = error "problem with function: errorNormalizeVDR in DodgeRendering"
@@ -132,7 +132,7 @@ drawWallFace w wall
     | isRHS sightFrom x y || _wlIsSeeThrough wall = blank
     | otherwise = setDepth (-1) . color (withAlpha 0 black) . polygon $ points
   where 
-    (x:y:_) = _wlLine wall 
+    (x,y) = _wlLine wall 
     points = extendConeToScreenEdge w sightFrom (x,y)
     sightFrom = _cameraViewFrom w
 
@@ -195,21 +195,18 @@ drawFFShadow w ff
 wallsPointsAndCols :: World -> [((Point2,Point2),Point4)]
 wallsPointsAndCols w = map f . filter (not . _wlIsSeeThrough) . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
   where 
-    linePairs (x:y:_) = (x,y)
-    f wl = (linePairs $ _wlLine wl, _wlColor wl)
+    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 
-    linePairs (x:y:_) = (x,y)
-    f wl = (linePairs $ _wlLine wl, _wlColor wl)
+    f wl = (_wlLine wl, _wlColor wl)
 
 wallsForShadows :: World -> [(Point2,Point2)]
-wallsForShadows w = map (linePairs . _wlLine) 
+wallsForShadows w = map _wlLine 
                         . filter (not . _wlIsSeeThrough)
                         . IM.elems $ wallsNearZones (zoneOfDoubleScreen w) w
-    where linePairs (x:y:_) = (x,y)
 
 lightsForGloom' :: World -> [Point4]
 lightsForGloom' w = map getLS (IM.elems $ _lightSources w) ++ map getTLS (_tempLightSources w)