Work on terminals and machines

src/Dodge/Placement/PlaceSpot.hs

@@ -92,9 +92,10 @@ placeSpotID ps pt w = case pt of
     PutMod      mdi         -> plNewUpID modifications mdID mdi w
     PutProp     prp         -> plNewUpID props pjID (mvProp p rot prp) w
     PutButton   bt          -> plNewUpID buttons btID (mvButton p rot bt) w
+    PutTerminal tm          -> plNewUpID terminals tmID tm w
     PutFlIt     itm         -> plNewUpID floorItems flItID (createFlIt p rot itm) w
     PutCrit     cr          -> plNewUpID creatures crID (mvCr p rot cr) w
-    PutMachine  col pps mc  -> plMachine col (map doShift pps) mc p rot w
+    PutMachine  pps mc      -> plMachine (map doShift pps) mc p rot w
     PutLS       ls          -> plNewUpID lightSources lsID (mvLS p' rot ls) w
     PutPPlate   pp          -> plNewUpID pressPlates ppID (mvPP p rot pp) w
     RandPS      rgn         -> evaluateRandPS rgn ps w
@@ -169,12 +170,13 @@ mvPP p rot pp = pp {_ppPos = p,_ppRot = rot}
 mvCr :: Point2 -> Float -> Creature -> Creature
 mvCr p rot cr = cr {_crPos = p,_crOldPos = p,_crDir = rot}
 
-plMachine :: Color -> [Point2] -> Machine -> Point2 -> Float -> World -> (Int,World)
-plMachine color wallpoly mc p rot gw = (mcid
+plMachine :: [Point2] -> Machine -> Point2 -> Float -> World -> (Int,World)
+plMachine wallpoly mc p rot gw = (mcid
     , gw & machines  %~ addMc
          & walls     %~ placeMachineWalls color wallpoly mcid wlid
     )
   where 
+    color = _mcColor mc
     w' = gw
     mcid = IM.newKey $ _machines w'
     wlid = IM.newKey $ _walls w'