Make hud non-saveable

src/Dodge/Data/HUD.hs

@@ -6,9 +6,9 @@
 module Dodge.Data.HUD where
 
 --import Dodge.Data.SelectionList
+import Dodge.Data.Button
+import Dodge.Data.FloorItem
 import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
 import Geometry.Data
 
 data HUDElement
@@ -31,12 +31,10 @@ data HUD = HUD
     , _carteCenter :: Point2
     , _carteZoom :: Float
     , _carteRot :: Float
+    , _closeObjects :: [Either FloorItem Button]
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''HUD
 makeLenses ''HUDElement
 makeLenses ''SubInventory
-deriveJSON defaultOptions ''SubInventory
-deriveJSON defaultOptions ''HUDElement
-deriveJSON defaultOptions ''HUD

src/Dodge/Data/LWorld.hs

@@ -148,10 +148,8 @@ data LWorld = LWorld
     , _pathGraph :: Gr Point2 PathEdge
     , _pnZoning :: IM.IntMap (IM.IntMap [(Int, Point2)]) --Zoning IM.IntMap Creature
     , _peZoning :: IM.IntMap (IM.IntMap (Set PathEdgeNodes))
-    , _hud :: HUD
     , _lightSources :: IM.IntMap LightSource
     , _tempLightSources :: [TempLightSource]
-    , _closeObjects :: [Either FloorItem Button]
     , _seenLocations :: IM.IntMap (WdP2, String)
     , _selLocation :: Int
     , _distortions :: [Distortion]

src/Dodge/Data/World.hs

@@ -32,6 +32,7 @@ data World = World
     , _input :: Input
     , _testFloat :: Float
     , _rbOptions :: RightButtonOptions
+    , _hud :: HUD
     }
 
 --    deriving (Eq, Ord, Show, Read) --Generic, Flat)