Cleanup

src/Dodge/Render/HUD.hs

@@ -124,7 +124,7 @@ drawMouseOver cfig w =
             (w ^? input . mouseContext . mcoCombSelect)
                 <|> (w ^? input . mouseContext . mcoCombCombine)
         sss <- w ^? hud . subInventory . ciSections
-        let idp = secondColumnParams
+        let idp = secondColumnLDP
         return . translateScreenPos cfig (idp ^. ldpPos)
             . color (withAlpha 0.2 white)
             $ selSecDrawCursorAt idp curs sss (j, i)
@@ -182,8 +182,8 @@ drawCombineInventory ::
     Picture
 drawCombineInventory cfig sss w =
     invHead cfig "COMBINE"
-        <> drawSelectionSections sss secondColumnParams cfig
-        <> drawSSCursor sss secondColumnParams curs cfig msel
+        <> drawSelectionSections sss secondColumnLDP cfig
+        <> drawSSCursor sss secondColumnLDP curs cfig msel
         <> combineInventoryExtra sss msel cfig w
   where
     curs = BoundaryCursor [North, South, West]
@@ -195,7 +195,7 @@ drawExamineInventory :: Config -> World -> Picture
 drawExamineInventory cfig w =
     invHead cfig "EXAMINE"
         <> drawSelectionList
-            secondColumnParams
+            secondColumnLDP
             cfig
             ( map
                 f
@@ -361,10 +361,10 @@ combineInventoryExtra sss msel cfig w = fold $ do
 drawTerminalDisplay :: Config -> Terminal -> Picture
 drawTerminalDisplay cfig tm =
     invHead cfig ("T-" ++ show tid)
-        <> drawSelectionList secondColumnParams cfig f
+        <> drawSelectionList secondColumnLDP cfig f
         <> color
             (withAlpha 0.5 green) -- consider integrating termScreenColor somehow
-            (drawSelectionListBackground secondColumnParams cfig tsize)
+            (drawSelectionListBackground secondColumnLDP cfig tsize)
         <> color (dark $ _tmExternalColor tm) (drawTitleBackground cfig)
   where
     tid = tm ^. tmID
@@ -394,7 +394,7 @@ lnkMidPosInvSelsCol cfig w i col = fromMaybe mempty . foldMap f
         sss <- w ^? hud . diSections
         combinesss <- w ^? hud . subInventory . ciSections
         lp <- selNumPos cfig invDP sss 0 j
-        rp <- selNumPos cfig secondColumnParams combinesss 0 i
+        rp <- selNumPos cfig secondColumnLDP combinesss 0 i
         invcol <- selSecSelCol 0 j sss
         return $ zConnectColMidX (rp - V2 5 0) (lp + V2 155 0) (rp ^. _1 - 20) col col col invcol
 

src/Dodge/Render/MenuScreen.hs

@@ -37,14 +37,14 @@ drawOptions :: Config -> String -> Maybe Int -> [SelectionItem a] -> Picture
 drawOptions cfig title msel sl =
     darkenBackground cfig
         <> drawTitle cfig title
-        <> drawSelectionList menuDisplayParams cfig sl
+        <> drawSelectionList menuLDP cfig sl
         <> translateScreenPos
             cfig
-            (menuDisplayParams ^. ldpPos)
+            (menuLDP ^. ldpPos)
             ( drawCursorAt
                 msel
                 sl
-                menuDisplayParams
+                menuLDP
                 50
                 (BoundaryCursor [North, South])
             )