Cleanup

src/Dodge/Update/Scroll.hs

@@ -3,7 +3,6 @@ module Dodge.Update.Scroll (
 ) where
 
 import SelectionIntMap
-import Dodge.SelectionList
 import qualified Data.Map.Strict as M
 import Data.Maybe
 import Dodge.Base

src/Dodge/Update/UsingInput.hs

@@ -3,11 +3,11 @@ module Dodge.Update.UsingInput (
     updateUsingInput,
 ) where
 
+import Dodge.Data.Combine
 import Dodge.Data.SelectionList
 import Control.Lens
 import qualified Data.Map.Strict as M
 import Dodge.Base.You
-import Dodge.Combine
 import Dodge.Creature.Impulse.UseItem
 import Dodge.Data.World
 import Dodge.InputFocus
@@ -78,9 +78,9 @@ pressedMBEffectsNoInventory pkeys w
 -- note "sort" on the inventory indices; otherwise
 -- lower items may be shifted up and items below these removed instead
 doCombine :: Int -> World -> World
-doCombine i w = case combineItemListYou w ^? ix i of
+doCombine i w = case w ^? hud . hudElement . subInventory . subInvMap . smShownItems . ix i . siPayload of
     Nothing -> w
-    Just (is, it) ->
+    Just (CombinableItem is it _) ->
         -- set (hud . hudElement) (DisplayInventory NoSubInventory)
         selectinv --enterCombineInv
             . createPutItem it