Move machine destruction to external function

src/Dodge/Data.hs

@@ -15,6 +15,7 @@ module Dodge.Data
     , module Dodge.Data.LoadAction
     , module Dodge.Data.ForegroundShape
     , module Dodge.Data.Wall
+    , module Dodge.Data.Object
     , module Dodge.Data.Zoning
     , module Dodge.Data.Bounds
     , module Dodge.Combine.Data
@@ -40,6 +41,7 @@ import Dodge.Data.RadarBlip
 import Dodge.Data.Room
 import Dodge.Data.Flare
 import Dodge.Data.PathGraph
+import Dodge.Data.Object
 import Dodge.Data.Zoning
 import Dodge.Data.ForegroundShape
 import Dodge.Data.LoadAction
@@ -1022,7 +1024,6 @@ data Machine = Machine
     { _mcID     :: Int
     , _mcWallIDs    :: IS.IntSet
     , _mcUpdate :: Machine -> World -> World
-    , _mcDeath  :: Machine -> World -> World
     , _mcApplyDamage    :: [Damage] -> Machine -> World -> World
     , _mcDraw   :: Machine -> SPic
     , _mcPos    :: Point2
@@ -1033,8 +1034,9 @@ data Machine = Machine
     , _mcDamage :: [Damage]
     , _mcLSs    :: [Int]
     , _mcType   :: MachineType
+    , _mcMounts :: M.Map Object Int
     , _mcName   :: String
-    , _mcTermMID :: Maybe Int
+--    , _mcTermMID :: Maybe Int
     }
 data Sensor = NoSensor
     | SensorToggleAmount