Cleanup

src/Dodge/Update/Input/InGame.hs

@@ -83,7 +83,7 @@ updateUseInputInGame u = updateFunctionKeys $ case u ^. uvWorld . hud of
                 & ciSelection .~ msel'
                 & ciFilter .~ filts'
 
-updateMouseInGame :: Configuration -> World -> World
+updateMouseInGame :: Config -> World -> World
 updateMouseInGame cfig w
     | Just 0 <- lbpress = updateMouseClickInGame cfig w
     | Just _ <- lbpress = updateMouseHeldInGame cfig w
@@ -93,13 +93,13 @@ updateMouseInGame cfig w
     lbpress = w ^? input . mouseButtons . ix ButtonLeft
     lbrelease = w ^? input . mouseButtonsReleased . ix ButtonLeft
 
-updateMouseHeldInGame :: Configuration -> World -> World
+updateMouseHeldInGame :: Config -> World -> World
 updateMouseHeldInGame cfig w = case w ^. input . mouseContext of
     OverInvDragSelect{} | ButtonRight `M.member` (w ^. input . mouseButtons) ->
             w & input . mouseContext .~ MouseGameRotate
     OverInvDragSelect (Just sstart) _ ->
         let sss = w ^. hud . diSections
-            msel = inverseSelNumPos cfig invDP sss (w ^. input . mousePos)
+            msel = inverseSelNumPos cfig invDP (w ^. input . mousePos) sss
         in case msel of
             Nothing -> w & input . mouseContext . mcoSelEnd .~ Nothing
             Just (i, j)
@@ -123,7 +123,7 @@ updateMouseHeldInGame cfig w = case w ^. input . mouseContext of
     OverInvDrag k mmouseover -> doDrag cfig 30 k mmouseover w
     _ -> w
 
-doDrag :: Configuration -> Int -> Int -> Maybe (Int, Int) -> World -> World
+doDrag :: Config -> Int -> Int -> Maybe (Int, Int) -> World -> World
 doDrag cfig n k mmouseover w = fromMaybe w $ do
     guard (n /= 0)
     ss <- w ^? hud . diSections . ix k . ssItems
@@ -200,7 +200,7 @@ isGroupSelectableSection = \case
     3 -> True
     _ -> False
 
-updateMouseClickInGame :: Configuration -> World -> World
+updateMouseClickInGame :: Config -> World -> World
 updateMouseClickInGame cfig w = case w ^. input . mouseContext of
     MouseInGame -> fromMaybe (w & input . mouseContext .~ OverInvDragSelect Nothing Nothing) $ do
         let sss = w ^. hud . diSections
@@ -303,7 +303,7 @@ collectInvItems secid is w = fromMaybe w $ do
         return . h (j + 1) ks $ swapInvItems (\_ _ -> Just (j + 1)) k w'
 
 shiftInvItems ::
-    Configuration ->
+    Config ->
     Int -> -- recurse limit
     Int -> -- section where drag started
     (Int, Int) -> -- selection item mouse is over

src/Dodge/Update/Input/ScreenLayer.hs

@@ -71,7 +71,7 @@ mouseClickOptionsList u = fromMaybe u $ do
             return $ f u & uvSoundQueue .:~ click1S
         _ -> Nothing
 
-ldpVerticalSelection :: Configuration -> ListDisplayParams -> Point2 -> Maybe Int
+ldpVerticalSelection :: Config -> ListDisplayParams -> Point2 -> Maybe Int
 ldpVerticalSelection cfig ldp (V2 _ y)
     | yupper == ylower = Just yupper
     | otherwise = Nothing
@@ -84,6 +84,6 @@ ldpVerticalSelection cfig ldp (V2 _ y)
     yupper = floor $ (top - (y + ygap)) / yoff
     ylower = ceiling ((top - y) / yoff) - 1
 
-setSelectionListRestriction :: Configuration -> ScreenLayer -> ScreenLayer
+setSelectionListRestriction :: Config -> ScreenLayer -> ScreenLayer
 setSelectionListRestriction cfig = 
     scAvailableLines .~ getAvailableListLines menuDisplayParams cfig