Continue inventory refactor

src/Dodge/Data/HUD.hs

@@ -5,12 +5,12 @@
 
 module Dodge.Data.HUD where
 
+import Dodge.Data.Item.Location
+import NewInt
 import Control.Lens
 import Data.IntMap
 import Data.IntSet (IntSet)
-import Dodge.Data.Button
 import Dodge.Data.Combine
-import Dodge.Data.FloorItem
 import Dodge.Data.SelectionList
 import Geometry.Data
 
@@ -50,8 +50,8 @@ data HUD = HUD
     , _carteCenter :: Point2
     , _carteZoom :: Float
     , _carteRot :: Float
-    , _closeItems :: [FloorItem]
-    , _closeInterfaces :: [Button]
+    , _closeItems :: [NewInt FloorInt]
+    , _closeInterfaces :: [Int]
     }
 
 makeLenses ''HUD