Add lights to buttons, cleanup

src/Dodge/Room/RoadBlock.hs

@@ -7,13 +7,12 @@ import Geometry
 import Dodge.Default.Room
 import Dodge.Room.Data
 import Dodge.Room.Link
-import Dodge.Room.Placement
+import Dodge.Placements
 import Dodge.Room.Corridor
 import Dodge.LevelGen.Data
 --import Dodge.RandomHelp
 import Dodge.Creature
 import Dodge.Layout.Tree.Polymorphic
-import Dodge.LightSources.Fitting
 
 import Data.Tree
 import Control.Monad.State
@@ -43,7 +42,7 @@ litCorridor90 = do
             ]
         , _rmPS    = 
             [ sPS (V2 20 (h-5)) 0     putLamp
-            , mountedLightI 70 (V2 0 (0.4*h)) (V2 40 (0.4*h))
+            , mountLightI 70 (V2 0 (0.4*h)) (V2 40 (0.4*h))
             , windowLine (V2 0 (h-20)) (V2 40 (h-20))
             , sPS (V2 (-50) (h-85)) 0   putLamp
             , windowLine (V2 (-40) (h-60)) (V2 (-40) (h-100))
@@ -76,6 +75,6 @@ blockedCorridor = do
     let plmnts = 
             [sPS (V2 20 40) r $ PutBlock [5,5,5] (V4 (150/256) ( 75/256)  0 ( 250/256)) 
                                           $ reverse $ rectNSWE 10 (-10) (-10) 10
-            ,mountedLightI 55 (V2 0 15) (V2 40 15)
+            ,mountLightI 55 (V2 0 15) (V2 40 15)
             ]
     sequence $ treeFromPost [] $ return $ Right $ set rmPS plmnts corridor