Cleanup

src/Dodge/Room/Foreground.hs

@@ -2,7 +2,6 @@
 module Dodge.Room.Foreground where
 import Picture
 import Geometry
-import Geometry.Vector3D
 import Shape
 import Quaternion
 

src/Dodge/Room/LongDoor.hs

@@ -55,11 +55,12 @@ twinSlowDoorRoom w h x = defaultRoom
     }
   where
     wlSpeed = 0.5
-    addColorChange lsid drid' = over pjUpdate $ dbArgChain $ const f
+    addColorChange lsid drid = over pjUpdate $ dbArgChain $ const f
       where
-        f w' | _drStatus (_doors w' IM.! drid') == DoorHalfway 
-                = w' & lightSources . ix lsid . lsParam . lsCol .~ V3 8 0 0
-             | otherwise = w' & lightSources . ix lsid . lsParam . lsCol .~ 0.7
+        f u | _drStatus (_doors u IM.! drid) == DoorHalfway 
+                        = u & updatelscol (V3 8 0 0)
+            | otherwise = u & updatelscol 0.7
+        updatelscol c = lightSources . ix lsid . lsParam . lsCol .~ c
     drmoving i w' = DoorHalfway == _drStatus (_doors w' IM.! i)
     lampHeight = 41
     ps = 

src/Dodge/Room/Procedural.hs

@@ -28,7 +28,6 @@ import Dodge.LevelGen.Data
 import Dodge.LevelGen.Switch
 import Dodge.Creature
 import Geometry
-import Geometry.Vector3D
 import Picture
 import Data.Tile
 

src/Dodge/Room/RezBox.hs

@@ -6,7 +6,7 @@ import Dodge.RoomLink
 import Dodge.LightSource
 --import Dodge.Room.LasTurret
 import Dodge.Data
-import Dodge.Default
+--import Dodge.Default
 --import Dodge.RoomLink
 import Dodge.Tree
 import Dodge.RandomHelp

src/Dodge/Room/RunPast.hs

@@ -3,7 +3,7 @@ import Dodge.LevelGen.Data
 import Dodge.LightSource
 import Dodge.RoomLink
 import Dodge.Data
-import Dodge.Default
+--import Dodge.Default
 --import Dodge.Layout.Tree.Either
 import Dodge.RandomHelp
 import Dodge.Room.Door