Add music support

2021-04-06 17:52:51 +02:00
parent 7801920fd2
commit 48ef0c0088
7 changed files with 100 additions and 69 deletions
@@ -20,9 +20,9 @@ loadSounds = do
    reloadSound'    <- Mix.load "./data/sound/reload1.wav"
    tone440         <- Mix.load "./data/sound/tone440.wav"
    pickupSound'    <- Mix.load "./data/sound/pickUp.wav"
-    putdownSound' <- Mix.load "./data/sound/whiteNoiseFadeOut.wav"
-    fireSound' <- Mix.load "./data/sound/fire1.wav"
-    grenadeBang' <- Mix.load "./data/sound/grenade.wav"
+    putdownSound'   <- Mix.load "./data/sound/whiteNoiseFadeOut.wav"
+    fireSound'      <- Mix.load "./data/sound/fire1.wav"
+    grenadeBang'    <- Mix.load "./data/sound/grenade.wav"
    tapQuiet' <- Mix.load "./data/sound/tapQuiet.wav"
    twoStep' <- Mix.load "./data/sound/twoStep.wav"
    healSound' <- Mix.load "./data/sound/heal.wav"
@@ -57,52 +57,54 @@ loadSounds = do
    glass3' <- Mix.load "./data/sound/Small-Piece-Of-Glass-Shattering-A3.wav" 
    glass4' <- Mix.load "./data/sound/Small-Piece-Of-Glass-Shattering-A4.wav" 
    foamSpray' <- Mix.load "./data/sound/foamSprayLoop.wav" 
-    return $ IM.fromList $ zip [0..] 
-                         $ [ pFireSound
-                           , click
-                           , reloadSound'
-                           , tone440
-                           , pickupSound'
-                           , putdownSound'
-                           , fireSound'
-                           , grenadeBang'
-                           , tapQuiet'
-                           , twoStep'
-                           , healSound'
-                           , doorSound'
-                           , twoStepSlow'
-                           , knifeSound'
-                           , buzzSound'
-                           , hitSound'      --15
-                           , autoGunSound'
-                           , shotgunSound'
-                           , teleSound'
-                           , longGunSound'
-                           , launcherSound'
-                           , smokeTrailSound'
-                           , foot1Sound'
-                           , foot2Sound'
-                           , lasSound'
-                           , teslaSound'  --25
-                           , crankSlow'  
-                           , autoB'
-                           , mini'
-                           , impactA'
-                           , impactB'  --30
-                           , impactC'
-                           , impactD'
-                           , glassShat1' --33
-                           , glassShat2'
-                           , glassShat3'
-                           , glassShat4'
-                           , glass1'    --37
-                           , glass2'
-                           , glass3'
-                           , glass4'    --40
-                           , foamSpray'
-                           ]
-
-
-soundOnce :: Int -> World -> World
-soundOnce i = over soundQueue ((:) i)
+    return $ IM.fromList $ zip [0..] $ 
+        [ pFireSound
+        , click
+        , reloadSound'
+        , tone440
+        , pickupSound'
+        , putdownSound'
+        , fireSound'
+        , grenadeBang'
+        , tapQuiet'
+        , twoStep'
+        , healSound'
+        , doorSound'
+        , twoStepSlow'
+        , knifeSound'
+        , buzzSound'
+        , hitSound'      --15
+        , autoGunSound'
+        , shotgunSound'
+        , teleSound'
+        , longGunSound'
+        , launcherSound'
+        , smokeTrailSound'
+        , foot1Sound'
+        , foot2Sound'
+        , lasSound'
+        , teslaSound'  --25
+        , crankSlow'  
+        , autoB'
+        , mini'
+        , impactA'
+        , impactB'  --30
+        , impactC'
+        , impactD'
+        , glassShat1' --33
+        , glassShat2'
+        , glassShat3'
+        , glassShat4'
+        , glass1'    --37
+        , glass2'
+        , glass3'
+        , glass4'    --40
+        , foamSpray'
+        ]

+loadMusic :: IO (IM.IntMap Mix.Music)
+loadMusic = do
+    undercity <- Mix.load "./data/music/undercity.mid"
+    return $ IM.fromList $ zip [0..] $
+        [ undercity
+        ]