Remove some flat instances in an effort to allow compilation

This commit is contained in:
2022-08-21 10:10:52 +01:00
parent 6e598339f1
commit 55c3a195c9
7 changed files with 38 additions and 25 deletions
+13 -12
View File
@@ -26,23 +26,24 @@ writeSaveSlot :: SaveSlot -> Universe -> IO (Universe -> Maybe Universe)
writeSaveSlot ss u = do
putStrLn $ "Saving " ++ saveSlotPath ss
createDirectoryIfMissing True "saveSlot"
BSS.writeFile (saveSlotPath ss) $
flat
(u ^. uvWorld . cWorld)
-- BSS.writeFile (saveSlotPath ss) $
-- flat
-- (u ^. uvWorld . cWorld)
return Just
readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
readSaveSlot ss = do
fExists <- doesFileExist $ saveSlotPath ss
if fExists
then do
bsstr <- BSS.readFile $ saveSlotPath ss
let cwstr = unflat bsstr
case cwstr of
Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers
Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw
& uvScreenLayers .~ []
else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers
-- if fExists
-- then do
-- bsstr <- BSS.readFile $ saveSlotPath ss
-- let cwstr = unflat bsstr
-- case cwstr of
-- Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers
-- Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw
-- & uvScreenLayers .~ []
-- else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers
return Just
where
removescreenlayers = Just . (uvScreenLayers .~ [])