Reorganise/cleanup

src/Dodge/Default/World.hs

@@ -143,11 +143,11 @@ defaultLWorld =
         , _lClock = 0
         }
 
-defaultDisplaySections :: SelectionSections a
-defaultDisplaySections = SelectionSections
-    { _sssSections = mempty
-    , _sssSelPos = Just (0,0)
-    }
+--defaultDisplaySections :: SelectionSections a
+--defaultDisplaySections = SelectionSections
+--    { _sssSections = mempty
+--    , _sssSelPos = Just (0,0)
+--    }
 
 defaultHUD :: HUD
 defaultHUD =
@@ -162,7 +162,7 @@ defaultHUD =
 defaultDisplayInventory :: HUDElement
 defaultDisplayInventory = DisplayInventory 
     {_subInventory = NoSubInventory
-    , _diSections = defaultFiltInv
+    , _diSections = defaultInvSections
 --    , _invRegex = Nothing
 --    , _closeRegex = Nothing
     }
@@ -179,10 +179,10 @@ defaultDisplayInventory = DisplayInventory
 --  where
 --    f (V2 x y) = V3 x y 100
 
-defaultFiltInv :: FilterableSections ()
-defaultFiltInv = FilterableSections
-        {_fssFilters = IM.fromList [(-1,mempty),(2,mempty)]
-        ,_fssSections =defaultInvSections
+defaultSSSExtra :: SSSExtra
+defaultSSSExtra = SSSExtra
+        {_sssFilters = IM.fromList [(-1,mempty),(2,mempty)]
+        ,_sssSelPos = Nothing
         }
 
 defaultInvSections :: SelectionSections ()
@@ -195,7 +195,7 @@ defaultInvSections = SelectionSections
             & ssDescriptor .~ "NEARBY")
         , defaultCOSection
         ]
-    , _sssSelPos = Nothing
+    , _sssExtra = defaultSSSExtra
     }
 defaultSS :: SelectionSection a
 defaultSS = SelectionSection