Work on saving/loading concurrently
This commit is contained in:
+9
-7
@@ -1,10 +1,11 @@
|
||||
module Main
|
||||
( main
|
||||
) where
|
||||
import Dodge.Menu
|
||||
import Loop
|
||||
import Dodge.TestString
|
||||
import Dodge.Data
|
||||
import Dodge.StartNewGame
|
||||
--import Dodge.StartNewGame
|
||||
import Dodge.Initialisation
|
||||
import Dodge.Concurrent
|
||||
--import Dodge.LevelGen
|
||||
@@ -47,7 +48,7 @@ main = do
|
||||
(winConfig sizex sizey (Just (posx,posy)))
|
||||
theCleanup
|
||||
(firstWorldLoad con)
|
||||
conTest
|
||||
conEffects
|
||||
theUpdateStep
|
||||
(flip handleEvent)
|
||||
|
||||
@@ -74,16 +75,17 @@ firstWorldLoad :: Configuration -> IO Universe
|
||||
firstWorldLoad theConfig = do
|
||||
SDL.cursorVisible $= False
|
||||
pdata <- doPreload >>= applyWorldConfig theConfig
|
||||
return $ startNewGame $ Universe
|
||||
{_uvWorld = initialWorld
|
||||
--return $ startNewGame $ Universe
|
||||
return $ Universe
|
||||
--{_uvWorld = initialWorld
|
||||
{_uvWorld = splashScreen
|
||||
,_uvConfig = theConfig
|
||||
,_preloadData = pdata
|
||||
,_menuLayers = []
|
||||
,_uvScreenLayers = [splashMenu]
|
||||
, _uvIOEffects = return
|
||||
, _uvTestString = testStringInit
|
||||
, _uvConcMessage = ""
|
||||
, _quickSave = Nothing
|
||||
, _uvConcEffects = Nothing
|
||||
, _uvConcEffects = NoConcEffect
|
||||
}
|
||||
|
||||
theUpdateStep :: Universe -> IO Universe
|
||||
|
||||
Reference in New Issue
Block a user