Cleanup

2023-05-10 20:32:26 +01:00
parent 312f342e09
commit 5f238a65d0
9 changed files with 96 additions and 92 deletions
@@ -69,17 +69,17 @@ data OptionScreenFlag = NormalOptions | GameOverOptions | SplashOptions
    | LoadingScreen
    deriving (Eq, Ord, Show, Read) --Generic, Flat)

-data PositionedMenuOption
-    = BottomMenuOption { _pmoMenuOption :: MenuOption }
-    | TopMenuOption { _pmoMenuOption :: MenuOption }
-    | NoPositionedMenuOption
+data EscapeMenuOption
+    = BottomEscapeMenuOption { _emoMenuOption :: MenuOption }
+    | TopEscapeMenuOption { _emoMenuOption :: MenuOption }
+    | NoEscapeMenuOption

 data ScreenLayer
    = OptionScreen
        { _scTitle :: String
        , _scOptions :: [MenuOption]
        , _scOffset :: Int
-        , _scPositionedMenuOption :: PositionedMenuOption
+        , _scPositionedMenuOption :: EscapeMenuOption
        , _scOptionFlag :: OptionScreenFlag
        , _scSelectionList :: SelectionList (Universe -> Universe,Universe->Universe)
        , _scAvailableLines :: Int
@@ -114,6 +114,6 @@ makeLenses ''ScreenLayer
 makeLenses ''SideEffect
 makeLenses ''MenuOptionDisplay
 makeLenses ''MenuOption
-makeLenses ''PositionedMenuOption
+makeLenses ''EscapeMenuOption
 makeLenses ''DebugItem
 makeLenses ''DebugInfo