Cleanup warnings

src/Dodge/Room.hs

@@ -8,47 +8,37 @@ module Dodge.Room
 import Dodge.Data
 import Dodge.Item.Weapon
 import Dodge.Creature
-import Dodge.Creature.Inanimate
-import Dodge.LevelGen
+--import Dodge.Creature.Inanimate
+--import Dodge.LevelGen
 import Dodge.LevelGen.Data
-import Dodge.Base
+--import Dodge.Base
 import Dodge.RandomHelp
 import Dodge.Default
-import Dodge.Path
-import Dodge.Layout
+--import Dodge.Path
+--import Dodge.Layout
 import Dodge.Layout.Tree.Polymorphic
 import Dodge.Layout.Tree.Either
-import Dodge.LightSources
-import Dodge.SoundLogic
+--import Dodge.LightSources
+--import Dodge.SoundLogic
 import Dodge.Room.Data
 import Dodge.Room.Placement
 import Dodge.Room.Procedural
 import Dodge.Room.Corridor
 import Dodge.Room.Link
-import Dodge.Room.Branch
+--import Dodge.Room.Branch
 import Dodge.Room.Door
 import Dodge.Room.Airlock
 import Dodge.Room.LongDoor
 import Geometry
 import Picture
 
-import qualified SDL.Mixer as Mix
 import Control.Lens
 import Control.Monad.State
 import Control.Monad.Loops
 import System.Random
-import Data.List
-import Data.Maybe
 import Data.Tree
-import Data.Either
-import Data.Function
-import Data.Graph.Inductive.Graph hiding ((&))
-import Data.Graph.Inductive.Basic
-import Data.Graph.Inductive.PatriciaTree
-import Data.Graph.Inductive.NodeMap
-import qualified Data.Map as M
-import qualified Data.IntMap.Strict as IM
-
+--import qualified Data.Map as M
+--import qualified Data.IntMap.Strict as IM
 
 roomC :: Float -> Float -> Room
 roomC x y = Room
@@ -144,7 +134,7 @@ miniRoom1 = do
                      ,windowLine (wth-60,   40+3*hf) (wllen,40+3*hf)
                      ,windowLine (wth-wllen,40+4*hf) (60,40+4*hf)
                      ,sPS (crx,cry) 0 $ PutCrit miniGunCrit
-                     ,sPS (wth-20,hgt/2+40) 0 randC
+                     ,sPS (wth-20,hgt/2+40) 0 randC1
                      ,sPS (wth/2,hgt/2) 0 putLamp
                      ,blockLine (        0, 40+1*hf) (wllen,40+1*hf)
                      ,blockLine (wth-wllen, 40+2*hf) (  wth,40+2*hf)
@@ -258,7 +248,6 @@ randFirstWeapon = do
         ++ replicate 2 autoGun
         ++ [launcher]
 
-randC = randC1
 
 weaponEmptyRoom :: RandomGen g => State g (Tree (Either Room Room))
 weaponEmptyRoom = do
@@ -285,21 +274,21 @@ weaponUnderCrits = do
             (connectRoom (set rmPS plmnts corridorN))
     rcp' <- roomCenterPillar
     let rcp = over rmPS ( sPS (120,80) 0 putLamp : ) rcp'
-    deadEndRoom <- takeOne [roomPillars,rcp]
+    deadEndRoom' <- takeOne [roomPillars,rcp]
     junctionRoom <- takeOne [Left tEast,Left tWest]
     return $ treeFromTrunk [Left corridorN,Left corridorN] 
                        $ Node junctionRoom
                               [continuationRoom
-                              ,deadRoom deadEndRoom
+                              ,deadRoom deadEndRoom'
                               ]
 
 weaponBehindPillar :: RandomGen g => State g (Tree (Either Room Room))
 weaponBehindPillar  = do
-      crPos <- takeOne $ [(x,y) | x <- [20,220], y <- [20,220]] ++ [(120,160),(120,200)]
+      cpos <- takeOne $ [(x,y) | x <- [20,220], y <- [20,220]] ++ [(120,160),(120,200)]
       let d p = argV $ (120,80) -.- p
       let plmnts1 = 
             [sPS (120,160)  0 $ RandPS randFirstWeapon
-            ,sPS crPos (d crPos) randC1
+            ,sPS cpos (d cpos) randC1
             ]
       rcp <- roomCenterPillar
       return $ treeFromTrunk 
@@ -337,11 +326,11 @@ weaponLongCorridor = do
     let branch2 = treeFromTrunk (replicate i2 $ Left corridorN) (deadRoom $ putWp corridor)
     return $ Node (Left root) [branch1,branch2]
       where 
-        putCrs = over rmPS (++ [sPS (10,40) (-pi/2) randC ,sPS (-10,40) (-pi/2) randC ])
+        putCrs = over rmPS (++ [sPS (10,40) (-pi/2) randC1 ,sPS (-10,40) (-pi/2) randC1 ])
         putWp = set rmPS [sPS (20,40) 0 $ RandPS randFirstWeapon ,sPS (20,60) 0 putLamp ]
 
 critInDeadEnd :: Room
-critInDeadEnd = set rmPS [sPS (0,0) 0 randC] deadEndRoom
+critInDeadEnd = set rmPS [sPS (0,0) 0 randC1] deadEndRoom
 
 deadEndRoom :: Room
 deadEndRoom = Room
@@ -367,7 +356,7 @@ weaponRoom = join $ takeOne
 roomCCrits :: RandomGen g => State g (Tree (Either Room Room))
 roomCCrits = do
     ps <- replicateM 20 $ randInCirc 9
-    let plmnts = map (\p -> sPS p 0 randC) 
+    let plmnts = map (\p -> sPS p 0 randC1) 
                        $ zipWith (+.+) [(x,y) | x<-[110,130,150,170,190], y<- [70,90,110,130,150]] ps
         lamps = [sPS (50,100) 0 putLamp , sPS (175,100) 0 putLamp]
     return $ connectRoom $ over rmPS ((lamps ++) . (plmnts ++)) $ roomC 200 200
@@ -457,10 +446,10 @@ shootersRoom = do
 pistolerRoom :: RandomGen g => State g Room
 pistolerRoom = do
     let f2 x y = singleBlock (x,y)
-        f3 x y = [blockLine (x-20,y) (x+20,y)
-                 ,blockLine (x,y-20) (x,y+20) ]
-        f4 x y = [blockLine (x-20,y-20) (x+20,y+20)
-                 ,blockLine  (x+20,y-20) (x-20,y+20) ]
+        --f3 x y = [blockLine (x-20,y) (x+20,y)
+        --         ,blockLine (x,y-20) (x,y+20) ]
+        --f4 x y = [blockLine (x-20,y-20) (x+20,y+20)
+        --         ,blockLine  (x+20,y-20) (x-20,y+20) ]
     f <- takeOne [f2]
     h <- state $ randomR (400,800)
     let w = h