From 89c93378226b1c2695d73da028b094ce3a041ae8 Mon Sep 17 00:00:00 2001 From: justin Date: Mon, 1 Sep 2025 20:12:50 +0100 Subject: [PATCH] Allow for more sounds to be playing at once --- data/dodge.config.json | 6 +----- src/Dodge/HeldUse.hs | 2 +- src/Dodge/SoundLogic/LoadSound.hs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/data/dodge.config.json b/data/dodge.config.json index a9745e92e..4450a700d 100644 --- a/data/dodge.config.json +++ b/data/dodge.config.json @@ -1,10 +1,6 @@ { "_debug_booleans": [ - "Show_ms_frame", - "Enable_debug", - "Cr_status", - "Show_walls_near_point_you", - "Show_zone_circ" + "Show_ms_frame" ], "_debug_view_clip_bounds": "NoRoomClipBoundaries", "_gameplay_rotate_to_wall": true, diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index 813fb4386..3dbbfb27f 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -444,7 +444,7 @@ applySoundCME itm cr = fromMaybe id $ do return $ if x > 0 then soundContinue (CrWeaponSound cid 0) (_crPos cr) soundid (Just x) - else soundMultiFrom [CrWeaponSound cid j | j <- [0 .. 5]] (_crPos cr) soundid Nothing + else soundMultiFrom [CrWeaponSound cid j | j <- [0 .. 16]] (_crPos cr) soundid Nothing where cid = _crID cr diff --git a/src/Dodge/SoundLogic/LoadSound.hs b/src/Dodge/SoundLogic/LoadSound.hs index 2e0e18d5a..b8fbf6c82 100644 --- a/src/Dodge/SoundLogic/LoadSound.hs +++ b/src/Dodge/SoundLogic/LoadSound.hs @@ -25,7 +25,7 @@ loadSounds = do putStrLn $ show y <> " channels assigned to group 1" fmap IM.fromList $ mapM loadSound $ zip [0..] soundPathList where - nchans = 64::Int + nchans = 128::Int loadMusic :: IO (IM.IntMap Mix.Music) loadMusic = do