Move SSSExtra out of SelectionSections

src/Dodge/Data/HUD.hs

@@ -5,6 +5,7 @@
 
 module Dodge.Data.HUD where
 
+import Data.IntMap
 import Control.Lens
 import Dodge.Data.Button
 import Dodge.Data.Combine
@@ -16,7 +17,8 @@ data HUDElement
     = DisplayInventory
         { _subInventory :: SubInventory
         , _diSections :: SelectionSections ()
-        , _diSelection :: Maybe (Int,Int)
+        , _diSelection :: Maybe (Int, Int)
+        , _diFilters :: IntMap (Maybe String)
         , _diSelectionExtra :: Int
         }
     | DisplayCarte
@@ -33,8 +35,10 @@ data SubInventory
         , _nsMouseOver :: Maybe (Int, Int)
         }
     | ExamineInventory
-    | CombineInventory {_ciSections :: SelectionSections CombinableItem
-        , _ciSelection :: Maybe (Int,Int)
+    | CombineInventory
+        { _ciSections :: SelectionSections CombinableItem
+        , _ciSelection :: Maybe (Int, Int)
+        , _ciFilters :: IntMap (Maybe String)
         }
     | LockedInventory
     | DisplayTerminal {_termID :: Int}

src/Dodge/Data/SelectionList.hs

@@ -35,7 +35,7 @@ data SelectionList a = SelectionList
 
 data SelectionSections a = SelectionSections
     { _sssSections :: IntMap (SelectionSection a)
-    , _sssExtra :: SSSExtra
+--    , _sssExtra :: SSSExtra
     }
 
 -- note that filters are arbitrary: the sssFilters point to the lower of