Broken commit

2023-02-17 20:20:57 +00:00
parent 1cb59d0809
commit 36b9b5445c
2 changed files with 41 additions and 33 deletions
@@ -11,6 +11,7 @@ import Dodge.Data.Button
 import Dodge.Data.FloorItem
 import Control.Lens
 import Geometry.Data
+import Data.IntMap.Strict (IntMap)

 data HUDElement
    = DisplayInventory 
@@ -23,7 +24,10 @@ data HUDElement
 data SubInventory
    = NoSubInventory
    | ExamineInventory {_subInvMSel :: Maybe Int}
-    | CombineInventory {_subInvMap :: SelectionIntMap CombinableItem}
+--    | CombineInventory {_subInvMap :: SelectionIntMap CombinableItem}
+    | CombineInventory {_ciCombinations :: IntMap CombinableItem
+        , _ciSections :: SelectionSections CombinableItem
+        }
    | LockedInventory
    | DisplayTerminal {_termID :: Int}
 --    deriving (Eq, Ord, Show, Read) --Generic, Flat)