Broken commit (removed loadKeyConfig)

src/Dodge/Item/Weapon/AutoGun.hs

@@ -49,10 +49,10 @@ autoGun = defaultAutoGun
     , _wpAmmo = basicBullet    
     }
 autoFireMode, singleFireMode, autoGunNonTwistEff :: Creature -> World -> World
-autoFireMode = shootWithSound (fromIntegral autoGunSound) 
+autoFireMode = shootWithSound autoGunSound
     . torqueBefore 0.05
     $ autoGunNonTwistEff
-singleFireMode = hammerCheck $ shootWithSound (fromIntegral autoGunSound) autoGunNonTwistEff
+singleFireMode = hammerCheck $ shootWithSound autoGunSound autoGunNonTwistEff
 autoGunNonTwistEff = withRecoil 40
     . withRandomDir (autogunSpread/2)
     . withMuzFlare

src/Dodge/Item/Weapon/Grenade.hs

@@ -32,7 +32,7 @@ moveGrenade 0 _ pID w = over projectiles (IM.delete pID)
     pj = _projectiles w IM.! pID
     explosion = _pjPayload pj
 moveGrenade time dir pID w = case hitWl of
-    Just _ -> soundOnce (fromIntegral tapQuiet) updatedWorld
+    Just _ -> soundOnce tapQuiet updatedWorld
     _      -> updatedWorld
   where 
     updatedWorld = updateV $ set (projectiles . ix pID . pjPos) finalPos

src/Dodge/Item/Weapon/Launcher.hs

@@ -37,7 +37,7 @@ launcher = defaultGun
     , _wpReloadState = 0
     , _itUseRate = 20
     , _itUseTime = 0
-    , _itUse = shootWithSound (fromIntegral launcherSound) . aRocketWithItemParams
+    , _itUse = shootWithSound launcherSound . aRocketWithItemParams
     , _wpSpread = 0.02
     , _wpRange = 20
     , _itFloorPict = onLayer FlItLayer launcherPic
@@ -92,14 +92,14 @@ pjThrust :: Int -> Projectile -> World -> World
 pjThrust i = pjEffTimeRange (st,et) doThrust
   where
     et | i == 0 = 36
-       | otherwise = 40 - (fromIntegral i * 20)
+       | otherwise = 40 - (i * 20)
     st = et - 100
 
 doThrust :: Projectile -> World -> World
 doThrust pj w = w
     & randGen .~ g
     & projectiles . ix i . pjVel    %~ (\v -> accel +.+ frict *.* v)
-    & soundFromPos (ShellSound i) newPos (fromIntegral smokeTrailSound) 1 250
+    & soundFromPos (ShellSound i) newPos smokeTrailSound 1 250
     & makeFlameletTimed (oldPos -.- vel) 0 (vel +.+ rotateV (pi+sparkD) accel) Nothing 3 10
     & smokeGen
   where

src/Dodge/Item/Weapon/TriggerType.hs

@@ -83,22 +83,21 @@ rateIncAB startRate fastRate shooteff1 shooteff2 cr w
 Shoot a weapon rapidly after a warm up.
 Applies ammo check as well.  -}
 withWarmUp 
-    :: Int  -- ^ Warm up time (in frames)
+    :: Int -- ^ warm up sound id
     -> (Creature -> World -> World) 
-            -- ^ Shoot effect
+            -- ^ underlying effect
     -> Creature
     -> World 
     -> World
-withWarmUp t f cr w
+withWarmUp soundID f cr w
     | reloadCondition = fromMaybe w $ startReloadingWeapon cr w
     | _wpReloadState item /= 0 = w
     | curWarmUp < maxWarmUp = w
         & pointerToItem . wpCurWarmUp +~ 2
-        & soundFrom (CrWeaponSound cid) 26 2 0
+        & soundFrom (CrWeaponSound cid) soundID 2 0
     | otherwise = w
         & pointerToItem . wpCurWarmUp .~ maxWarmUp
         & f cr
---        & soundFrom (CrWeaponSound cid) 28 2 0
   where 
     cid = _crID cr
     itRef = _crInvSel cr
@@ -106,7 +105,6 @@ withWarmUp t f cr w
     pointerToItem = creatures . ix cid . crInv . ix itRef
     curWarmUp = _wpCurWarmUp item
     maxWarmUp = _wpMaxWarmUp item
-    fState = _itUseTime item
     reloadCondition = _wpLoadedAmmo item == 0
 {- | Adds a sound to a creature based world effect. 
 The sound is emitted from the creature's position. -}