Centralise mouse context data

src/Dodge/Update/Input/InGame.hs

@@ -108,7 +108,7 @@ updateCombineInvClick ::
     World ->
     World
 updateCombineInvClick msel sss w = fromMaybe trydocombination $ do
-    (i,j) <- w ^? hud . hudElement . diMouseOver . _Just
+    (i,j) <- w ^? input . mouseContext . mcoInv
     guard $ i == 0
     str <- fmap (take 5) $ w 
         ^? hud . hudElement . diSections . ix i . ssItems . ix j . siPictures . ix 0
@@ -118,7 +118,7 @@ updateCombineInvClick msel sss w = fromMaybe trydocombination $ do
                 & hud . hudElement . subInventory . ciFilter .~ Nothing
             _ -> w & hud . hudElement . subInventory . ciFilter ?~ ("<" ++ str)
   where
-    trydocombination = case w ^? hud . hudElement . subInventory . ciMouseOver . _Just of
+    trydocombination = case w ^? input . mouseContext . mcoCombInv of
         x@(Just (i,_)) 
             | x /= msel -> w & hud . hudElement . subInventory . ciSelection .~ x
                     & worldEventFlags . at CombineInventoryChange ?~ ()
@@ -330,7 +330,6 @@ toggleMap u = case u ^. uvWorld . hud . hudElement of
                 , --        , _diFilters = IM.fromList [(-1, mempty), (2, mempty)]
                   _diInvFilter = mempty
                 , _diCloseFilter = mempty
-                , _diMouseOver = Nothing
                 }
     _ -> u & uvWorld . hud . hudElement .~ DisplayCarte