Cleanup warnings

src/Dodge/Room/LongDoor.hs

@@ -57,8 +57,8 @@ twinSlowDoorRoom drID w h x = Room
         [0..nDrp]
     drR = fmap ((\h' -> ((-x,-h'),(-x,h-h'))) . (* h) . (/ fromIntegral nDrp) . fromIntegral) 
         [0..nDrp]
-    nDrp = ceiling h
-    cond w = or $ M.lookup (DoorNumOpen drID) (_worldState w)
+    nDrp = ceiling h :: Int
+    cond w' = or $ M.lookup (DoorNumOpen drID) (_worldState w')
     col = dim $ dim $ bright red
 
 twinSlowDoorChasers 
@@ -90,7 +90,7 @@ slowDoorRoom = do
      ys' <- replicateM 5 $ state $ randomR (h+20,y)
      let crits = zipWith (\p r -> sPS p r randC1) ps rs
          lsources = [sPS (x/2,30) 0 putLamp, sPS (x/2,y-30) 0 putLamp]
-         barrels = zipWith (\x y -> sPS (x,y) 0 $ PutCrit explosiveBarrel) xs' ys'
+         barrels = zipWith (\x' y' -> sPS (x',y') 0 $ PutCrit explosiveBarrel) xs' ys'
          pillarsa = []
          pillarsb = putBlockRect (x/5-20) (x/5+20) (h/2-20) (h/2+20)
             ++ putBlockRect (2*x/5-20) (2*x/5+20) (h/2-20) (h/2+20)
@@ -99,8 +99,8 @@ slowDoorRoom = do
          pillarsc = putBlockRect (x/3-20) (x/3+20) (h/2-20) (h/2+20)
             ++ putBlockRect (2*x/3-20) (2*x/3+20) (h/2-20) (h/2+20)
      pillars <- takeOne [pillarsa, pillarsb, pillarsc]
-     let cond x = (snd . fst) x > h + 40
-         cond2 x = (snd . fst) x < h - 40
+     let cond x'  = (snd . fst) x' > h + 40
+         cond2 x' = (snd . fst) x' < h - 40
      but <- takeOne [PutBtDoor (dim $ light red) butPos butRot (0,h) (x,h)
                   --  ,PutSwitchDoor (dim $ light red) butPos butRot (0,h) (x,h)
                     ]
@@ -112,4 +112,5 @@ slowDoorRoom = do
                 )
         )
 
+randC1 :: PSType
 randC1 = RandPS $ takeOne $ map PutCrit $ armourChaseCrit : replicate 50 chaseCrit