Cleanup

src/Dodge/Placement/Instance/Terminal.hs

@@ -30,7 +30,7 @@ putTerminal''
     -> Placement
 putTerminal'' mc f mcf = ps0PushPSw (PutTerminal theterminal) $ \_ tmpl -> Just $
     ps0PushPS (PutButton $ termButton & btTerminal .~ _plMID tmpl)
-    $ \pl -> Just $ pt0 (PutMachine (reverse $ square 10) 
+    $ \pl -> Just $ pt0 (PutMachine (reverse $ square 10)
         (mc & mcUpdate .~ machineAddSound fridgeHumS (mcf (fromJust $ _plMID pl))
             & mcDeath %~ (\fd mc' -> (buttons . at (fromJust (_plMID pl)) .~ Nothing) . fd mc')
         )
@@ -51,18 +51,25 @@ putTerminal' col = putTerminal'' (defaultMachine & mcColor .~ col)
     }
 
 putTerminal :: Color -> (World -> TerminalParams) -> Placement
-putTerminal col f = ps0PushPSw (PutTerminal theterminal) $ \_ tmpl -> Just $
-     ps0PushPS (PutButton $ termButton & btTerminal .~ _plMID tmpl)
-    $ \pl -> Just $ pt0 (PutMachine (reverse $ square 10) (defaultMachine & mcColor .~ col)
-    { _mcDraw = noPic . terminalShape
-    , _mcHP = 100
-    , _mcUpdate = basicMachineUpdate $ machineAddSound fridgeHumS (const id)
-    , _mcDeath = \mc -> (buttons . at (fromJust (_plMID pl)) .~ Nothing)
-        . makeExplosionAt (_mcPos mc)
-    })
-    $ const Nothing
+putTerminal col f = putTerminal'' (mc & mcColor .~ col) f (\_ -> basicMachineUpdate $ const id)
   where
-    theterminal = defaultTerminal & tmProgram .~ const f
+    mc = defaultMachine
+        { _mcDraw = noPic . terminalShape
+        , _mcHP = 100
+        , _mcDeath = makeExplosionAt . _mcPos
+        }
+--  ps0PushPSw (PutTerminal theterminal) $ \_ tmpl -> Just $
+--     ps0PushPS (PutButton $ termButton & btTerminal .~ _plMID tmpl)
+--    $ \pl -> Just $ pt0 (PutMachine (reverse $ square 10) (defaultMachine & mcColor .~ col)
+--    { _mcDraw = noPic . terminalShape
+--    , _mcHP = 100
+--    , _mcUpdate = basicMachineUpdate $ machineAddSound fridgeHumS (const id)
+--    , _mcDeath = \mc -> (buttons . at (fromJust (_plMID pl)) .~ Nothing)
+--        . makeExplosionAt (_mcPos mc)
+--    })
+--    $ const Nothing
+--  where
+--    theterminal = defaultTerminal & tmProgram .~ const f
 
 termButton :: Button
 termButton = Button
@@ -73,7 +80,6 @@ termButton = Button
     , _btID = 0
     , _btText = "TERMINAL"
     , _btState = BtOff
-    , _btTerminalParams = const $ TerminalParams [] [] 10 "TERMINAL" Nothing Nothing [] []
     , _btTerminal = Nothing
     , _btName = ""
     }