Cleanup warnings

src/Dodge/WorldEvent/SpawnParticle.hs

@@ -12,7 +12,6 @@ import Dodge.WorldEvent.HitEffect
 import Dodge.WorldEvent.ThingsHit
 import Dodge.WorldEvent.Cloud
 import Dodge.WorldEvent.Flash
-import Dodge.WorldEvent.HelperParticle
 import Dodge.WorldEvent.Bullet
 import Dodge.SoundLogic
 import Dodge.RandomHelp
@@ -98,7 +97,7 @@ moveFlame
 moveFlame rotd w pt 
     | time <= 0 = (smokeGen w, Nothing)
     | otherwise = case thingsHitExceptCr (_btPassThrough' pt) sp ep w of
-            ((p,E3x1 cr):_)       -> (soundAndGlare damcrs        , mvPt')
+            ((_,E3x1 _):_)       -> (soundAndGlare damcrs        , mvPt')
             (thing@(p,E3x2 wl):_) -> (fst $ hiteff [thing] damcrs , rfl wl p)
             _                     -> (soundAndGlare damcrs        , mvPt)
   where 
@@ -198,12 +197,8 @@ drawFlamelet rot pt = setLayer 1 $ pictures [pic , piu , pi2 , glow]
     sc = (*) 2 $ log $ 1 + fromIntegral time / 20
     s1 = (*) 2 $ log $ 2 + fromIntegral time / 40
     s2 = 0.5 * (sc + s1)
-    thepicture = pictures [pic , piu , pi2 , glow]
-
-{-
-Update of a flamelet.
-Applies movement and attaches damage to nearby creatures.
- -}
+{- Update of a flamelet.
+Applies movement and attaches damage to nearby creatures.  -}
 moveFlamelet :: World -> Particle -> (World, Maybe Particle)
 moveFlamelet w pt 
     | _btTimer' pt <= 0 = (     w, Nothing)
@@ -297,11 +292,10 @@ moveTeslaArc p d i w =
     f1 (E3x1 cr) = Just $ _crID cr
     f1 _         = Nothing
     hitCrs       = mapMaybe f1 $ take 14 $ crsLightChain p d 0 w
-    damCrs i = over (creatures . ix i . crHP) (\hp -> hp - 5)
+    damCrs cid = over (creatures . ix cid . crHP) (\hp -> hp - 5)
     f2 0 = cyan
     f2 1 = azure
     f2 _ = white
-    sID  = newProjectileKey w
     q1 = last $ init ps'
     q2 = last ps'
     hitWall = reflectPointWalls q1 ((2 *.* q2) -.- q1) $ wallsNearPoint q1 w
@@ -372,13 +366,11 @@ crOrWallSensitive p dir wlAttract w =
     g (E3x2 p1)  = 100 + dist p p1 -- tweak makes it more likely to hit crs first
     --g (E3x2 p1)  = dist p p1 - 100 -- tweak makes it more likely to hit walls first
     g (E3x1 cr1) = dist p $ _crPos cr1
+    g _ = 0
     (arcLen,_) = randomR (25,50) $ _randGen w
 -- BUG: can hit crs through walls
-
-{-
-Finds whether a creature or wall is in front of a given point and direction.
-Evaluates to a creature as an 'E3x1' or a wall as an 'E3x2'.
- -}
+{- Finds whether a creature or wall is in front of a given point and direction.
+Evaluates to a creature as an 'E3x1' or a wall as an 'E3x2'.  -}
 crOrWall :: Point2 -> Float -> World -> Either3 Creature Point2 Point2
 crOrWall p dir w = fromMaybe (E3x3 $ p +.+ rotateV dir (arcLen,0))
                         $ listToMaybe $ sortBy (compare `on` g)
@@ -400,8 +392,8 @@ crOrWall p dir w = fromMaybe (E3x3 $ p +.+ rotateV dir (arcLen,0))
     g (E3x2 p1)  = 100 + dist p p1 -- tweak makes it more likely to hit crs first
     --g (E3x2 p1)  = dist p p1 - 100 -- tweak makes it more likely to hit walls first
     g (E3x1 cr1) = dist p $ _crPos cr1
+    g _ = 0
     (arcLen,_) = randomR (25,50) $ _randGen w
-
 -- | Create a spark. 
 -- If the spark is created by another Particle, it cannot be directly added to
 -- the list, hence the redirect through worldEvents.
@@ -409,7 +401,7 @@ createSpark :: Int -> Int -> Point2 -> Float -> Maybe Int -> World -> World
 createSpark time colid pos dir maycid w 
     = w & worldEvents %~ ( (over particles (spark :) . sparkFlashAt pos') . )
   where 
-    spark = Bul'  
+    spark = Bul'
         { _ptDraw = drawBul
         , _ptUpdate' = mvGenBullet'
         , _btVel' = rotateV dir (5,0)
@@ -428,4 +420,6 @@ createSpark time colid pos dir maycid w
         ep = sp +.+ _btVel' bt
 
 drawBul :: Particle -> Picture
-drawBul pt = setLayer 1 . color white $ thickLine (take 2 $ _btTrail' pt) (_btWidth' pt)
+drawBul pt = setLayer 1 . color thecolor $ thickLine (take 2 $ _btTrail' pt) (_btWidth' pt)
+  where
+    thecolor = _btColor' pt