Add text messages on loading screens
This commit is contained in:
+8
-17
@@ -1,13 +1,9 @@
|
||||
module Main (
|
||||
main,
|
||||
) where
|
||||
module Main (main) where
|
||||
|
||||
import Dodge.StartNewGame
|
||||
import Control.Lens
|
||||
import Control.Monad
|
||||
import Control.Parallel
|
||||
import qualified Data.Map.Strict as M
|
||||
--import Data.Preload.Render
|
||||
import qualified Data.Text as T
|
||||
import Dodge.Concurrent
|
||||
import Dodge.Config
|
||||
@@ -15,25 +11,19 @@ import Dodge.Data
|
||||
import Dodge.Event
|
||||
import Dodge.Initialisation
|
||||
import Dodge.LoadSeed
|
||||
--import Dodge.Menu
|
||||
import Dodge.Render
|
||||
import Dodge.SoundLogic.LoadSound
|
||||
import Dodge.StartNewGame
|
||||
import Dodge.TestString
|
||||
import Dodge.Update
|
||||
--import qualified IntMapHelp as IM
|
||||
import Loop
|
||||
--import Picture
|
||||
import Preload
|
||||
import Preload.Render
|
||||
--import Render
|
||||
|
||||
import SDL (($=))
|
||||
import qualified SDL
|
||||
--import qualified SDL.Mixer as Mix
|
||||
import Sound
|
||||
import System.Directory
|
||||
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
-- load the config to get the window size and position
|
||||
@@ -112,7 +102,8 @@ theUpdateStep win = doSideEffects <=< updateRenderSplit win
|
||||
|
||||
updateRenderSplit :: SDL.Window -> Universe -> IO Universe
|
||||
updateRenderSplit win u = do
|
||||
updateUniverse u `par` void (doDrawing win u)
|
||||
--updateUniverse u `par` void (doDrawing win u)
|
||||
updateUniverse u `par` doDrawing win u
|
||||
return $! updateUniverse u
|
||||
|
||||
playSoundUnlessRewinding :: Universe -> IO (M.Map SoundOrigin Sound)
|
||||
@@ -144,13 +135,13 @@ doPreload = do
|
||||
putStrLn "Start sound preload"
|
||||
lChunks <- loadSounds
|
||||
putStrLn "Skip music preload!"
|
||||
-- lMusic <- loadMusic
|
||||
-- Mix.playMusic Mix.Forever (lMusic IM.! 0)
|
||||
-- lMusic <- loadMusic
|
||||
-- Mix.playMusic Mix.Forever (lMusic IM.! 0)
|
||||
putStrLn "Return PreloadData"
|
||||
return
|
||||
PreloadData
|
||||
{ _renderData = rData
|
||||
, _soundData = lChunks
|
||||
--, _musicData = MusicData{_loadedMusic = lMusic}
|
||||
, _musicData = mempty
|
||||
, --, _musicData = MusicData{_loadedMusic = lMusic}
|
||||
_musicData = mempty
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user