Correct loading of tile buffer when loading game

src/Dodge/Save.hs

@@ -9,6 +9,7 @@ module Dodge.Save (
 ) where
 
 
+import Dodge.WorldLoad
 import Dodge.Path.Translate
 import Data.Graph.Inductive (labEdges, labNodes)
 import Dodge.Zoning.Pathing
@@ -41,22 +42,21 @@ writeSaveSlot ss u = do
 readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe)
 readSaveSlot ss = do
     fExists <- doesFileExist $ saveSlotPath ss
-    if fExists
-        then do
-            cwstr <- decodeFileStrict $ saveSlotPath ss
-            case cwstr of
-                Nothing -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers
-                Just cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw
+    if not fExists then error "Tried to read non-existant save file"
+        else return ()
+    mcw <- decodeFileStrict $ saveSlotPath ss
+    flip (maybe (error "Tried to read incorrectly encoded save file")) mcw $ \cw ->
+        return $ \uv -> Just 
+            $ uv & uvWorld . cWorld .~ cw
                     & uvWorld %~ initWallZoning
                     & uvWorld . pnZoning .~ foldl' (flip zonePn) mempty 
                         (labNodes $ path uv)
                     & uvWorld . peZoning .~ foldl' (flip zonePe) mempty 
                         (map fromEdgeTuple $ labEdges $ path uv)
                     & uvScreenLayers .~ []
-        else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers
+                    & postUniverseLoadSideEffect
   where
     path uv = uv ^. uvWorld . cWorld . pathGraph
-    removescreenlayers = Just . (uvScreenLayers .~ [])
 
 saveSlotPath :: SaveSlot -> String
 saveSlotPath (SaveSlotNum i) = "saveSlot/" ++ show i
@@ -64,14 +64,13 @@ saveSlotPath QuicksaveSlot = "saveSlot/QuickSave"
 saveSlotPath (LevelStartSlot i) = "saveSlot/LevelStart" ++ show i
 
 saveWorldInSlot :: SaveSlot -> Universe -> Universe
---saveWorldInSlot slot u = u & uvSideEffects %~ (|> NewSideEffect (writeSaveSlot slot u) "SAVING")
 saveWorldInSlot slot u = u & addSideEffect (writeSaveSlot slot u) "SAVING"
     
 reloadLevelStart :: Universe -> Universe
 reloadLevelStart = loadSaveSlot (LevelStartSlot 0)
 
 loadSaveSlot :: SaveSlot -> Universe -> Universe
-loadSaveSlot slot = addSideEffect (readSaveSlot slot) "LOADING"
+loadSaveSlot slot = blockingLoad "LOADING SAVE" $ readSaveSlot slot
 
 doQuicksave :: Universe -> Universe
 doQuicksave = saveWorldInSlot QuicksaveSlot