Try to move sound into world, slightly broken now

2021-09-08 19:12:54 +01:00
parent 04e5b9b39f
commit c3d567353c
9 changed files with 33 additions and 56 deletions
@@ -78,6 +78,7 @@ data World = World
    , _buttons              :: IM.IntMap Button
    , _soundQueue           :: [(Int,Int16)]
    , _sounds               :: M.Map SoundOrigin Sound
+    , _playingSounds        :: M.Map SoundOrigin Sound
    , _decorations          :: IM.IntMap Picture
    , _foregroundDecorations :: [Polyhedra]
    , _foregroundEdgeVerx   :: [Point3]
@@ -102,14 +103,14 @@ data World = World
    , _selLocation          :: Int
    , _keyConfig            :: KeyConfigSDL
    , _config               :: Configuration
-    , _sideEffects          :: [PreloadData SoundOrigin -> IO (PreloadData SoundOrigin)]
-    , _doneSideEffects      :: [PreloadData SoundOrigin -> IO (PreloadData SoundOrigin)]
+    , _sideEffects          :: [PreloadData -> IO PreloadData]
+    , _doneSideEffects      :: [PreloadData -> IO PreloadData]
    , _debugFlags           :: DebugFlags
    , _inventoryMode        :: InventoryMode
    , _lClickHammer         :: HammerPosition
    , _radDistortion        :: [(Point2,Point2,Point2,Float)]
    , _gameRooms            :: [GameRoom]
-    , _preloadData          :: PreloadData SoundOrigin
+    , _preloadData          :: PreloadData
    }
 data OptionScreenFlag = NormalOptions | GameOverOptions
 data ScreenLayer