Merge branch 'master' of ssh://git.xkjq.uk:30001/justin/loop

app/Main.hs

@@ -1,31 +1,33 @@
 module Main where
-import           Dodge.Data
-import           Dodge.Default
-import           Dodge.Event
-import           Dodge.Floor
-import           Dodge.Initialisation
-import           Dodge.Layout
-import           Dodge.LoadConfig
-import           Dodge.LoadSound
-import           Dodge.Menu
-import           Dodge.Render
-import           Dodge.Rooms
-import           Dodge.Update
-import           LoadConfig
-import           Loop
-import           Picture
-import           Picture.Preload
-import           Picture.Render
-import           Preload
-import           Shader
-import           Sound
-import           Sound.Preload
+import Loop
+import Shader
+import LoadConfig
+import Dodge.Default
+import Dodge.Data
+import Dodge.Initialisation
+import Dodge.Rooms
+import Dodge.Layout
+import Dodge.Update
+import Dodge.Event
+import Dodge.Render
+import Dodge.Menu
+import Dodge.Floor
+import Dodge.LoadConfig
+import Dodge.LoadSound
+import Picture
+import Picture.Render
+import Picture.Preload
+import Sound
+import Preload
+import Sound.Preload
 
 import           Control.Concurrent
 import           Control.Lens
 import           Foreign                   (Word32)
 
-import           Control.Monad             (void, when)
+import Control.Monad (when,void)
+ 
+import System.Random
 
 import           System.Random
 
@@ -53,9 +55,9 @@ main = do
         (fmap (setWindowSize sizex sizey keyConfig) firstWorld)
         ( \preData w -> do
             startTicks <- SDL.ticks
-            doDrawing (_renderData preData) w
-            playSoundQueue (_soundData preData) (_soundQueue w)
-            newSoundData <- playAndUpdate (_sounds w) (_soundData preData)
+            void $ doDrawing (_renderData preData) w
+            playSoundQueue (_loadedChunks $ _soundData preData) (_soundQueue w)
+            newPlayingSounds <- playAndUpdate (_soundData preData) (_sounds w)
 
             endTicks <- SDL.ticks
             let lastFrameTicks = _frameTimer preData
@@ -67,7 +69,7 @@ main = do
                         )
 
 
-            return $ preData & soundData  .~ newSoundData
+            return $ preData & soundData . playingSounds .~ newPlayingSounds
                              & frameTimer .~ endTicks
         )
         (flip $ menuEvents handleEvent)