Commit before messing with main inventory display

src/Dodge/Update/Input.hs

@@ -5,6 +5,7 @@ module Dodge.Update.Input (
     doSubInvRegexInput,
 ) where
 
+import Dodge.DisplayInventory
 import SelectionIntMap
 import qualified Data.Map.Strict as M
 import Data.Char
@@ -91,7 +92,7 @@ updateKeyInGame uv sc InitialPress = case sc of
     ScancodeSpace -> over uvWorld spaceAction uv
     ScancodeP -> pauseGame uv
     ScancodeF -> over uvWorld youDropItem uv
-    ScancodeM -> over uvWorld toggleMap uv
+    ScancodeM -> toggleMap uv
     ScancodeR -> over (uvWorld . cWorld . lWorld . creatures . ix 0) crToggleReloading uv
     ScancodeT -> over uvWorld testEvent uv
     ScancodeX -> uv & uvWorld %~ toggleTweakInv
@@ -119,24 +120,28 @@ pauseGame u = u & uvScreenLayers .~ [pauseMenu u]
 spaceAction :: World -> World
 spaceAction w = case w ^?! hud . hudElement of
     DisplayCarte -> w & hud . carteCenter .~ theLoc
-    DisplayInventory NoSubInventory -> case selectedCloseObject w of
+    DisplayInventory {_subInventory = NoSubInventory} -> case selectedCloseObject w of
         Just (_, Left flit) -> pickUpItem 0 flit w
         Just (_, Right but) -> doButtonEvent (_btEvent but) but w
         _ -> w
-    DisplayInventory DisplayTerminal{} -> w & hud . hudElement . subInventory .~ NoSubInventory
+    DisplayInventory {_subInventory = DisplayTerminal{}} 
+        -> w & hud . hudElement . subInventory .~ NoSubInventory
     _ -> w & hud . hudElement . subInventory .~ NoSubInventory
   where
     --theLoc = doWorldPos (fst (_seenLocations (_cWorld w) IM.! _selLocation (_cWorld w))) w
     theLoc = doWorldPos (w ^?! cWorld . lWorld . seenLocations . ix (w ^. cWorld . lWorld . selLocation) . _1) w
 
-toggleMap :: World -> World
-toggleMap w = case w ^?! hud . hudElement of
-    DisplayCarte -> w & hud . hudElement .~ DisplayInventory NoSubInventory
-    _ -> w & hud . hudElement .~ DisplayCarte
+toggleMap :: Universe -> Universe
+toggleMap u = case u ^?! uvWorld . hud . hudElement of
+    DisplayCarte -> u & uvWorld . hud . hudElement .~ DisplayInventory {_subInventory = NoSubInventory, _diSections = makeDisplayInventory w cfig}
+    _ -> u & uvWorld . hud . hudElement .~ DisplayCarte
+  where
+    w = u ^. uvWorld
+    cfig = u ^. uvConfig
 
 toggleTweakInv :: World -> World
-toggleTweakInv w = case w ^. hud . hudElement of
-    DisplayInventory ExamineInventory{} -> w & thepointer .~ NoSubInventory
+toggleTweakInv w = case w ^? hud . hudElement . subInventory of
+    Just ExamineInventory{} -> w & thepointer .~ NoSubInventory
     _ -> w & thepointer .~ ExamineInventory mi
   where
     thepointer = hud . hudElement . subInventory