Move machine update into outside function

2022-07-14 21:01:53 +01:00
parent ad33ddd569
commit 5463328d41
13 changed files with 130 additions and 92 deletions
@@ -1020,11 +1020,16 @@ data TerminalToggle = TerminalToggle
    { _ttTriggerID :: Int
    , _ttDeathEffect :: (World -> Bool) -> (World -> Bool)
    }
+--data DamageApplication
+--    = ApplyNoDamage
+--    | DefaultApplyDamage
+
 data Machine = Machine
    { _mcID     :: Int
    , _mcWallIDs    :: IS.IntSet
-    , _mcUpdate :: Machine -> World -> World
+--    , _mcUpdate :: Machine -> World -> World
    , _mcDraw   :: Machine -> SPic
+--    , _mcDamageApplication :: DamageApplication
    , _mcPos    :: Point2
    , _mcDir    :: Float
    , _mcColor  :: Color
@@ -1035,7 +1040,8 @@ data Machine = Machine
    , _mcType   :: MachineType
    , _mcMounts :: M.Map Object Int
    , _mcName   :: String
-    , _mcCloseSound :: Maybe SoundID
+--    , _mcTriggerCond :: Machine -> Bool
+    , _mcCloseSound  :: Maybe SoundID
 --    , _mcTermMID :: Maybe Int
    }
 data Sensor = NoSensor