Cleanup, fix menu lock on restarting level after game over

2021-12-06 23:44:10 +00:00
parent 19540bd19e
commit 763b771928
18 changed files with 88 additions and 119 deletions
@@ -105,7 +105,6 @@ data World = World
    , _pathGraph            :: ~(Gr Point2 Float)
    , _pathGraphP           :: ~[(Point2,Point2)]
    , _pathPoints           :: ~(IM.IntMap (IM.IntMap [(Int,Point2)]))
-    , _worldFlags           :: S.Set WorldFlag
    , _carteDisplay         :: !Bool
    , _carteCenter          :: !Point2
    , _carteZoom            :: !Float
@@ -273,10 +272,6 @@ data CrMvType
        , _mvTurnJit    :: Float
        , _mvAimSpeed   :: Float -> Float
        }
-data WorldFlag
-    = ResetLevel Int
-    | GameOver
-  deriving (Eq,Ord)
 data Button = Button 
    { _btPict :: Button -> SPic
    , _btPos :: Point2