diff options
| author | Juan J. Martinez <jjm@usebox.net> | 2023-02-24 22:51:42 +0000 |
|---|---|---|
| committer | Juan J. Martinez <jjm@usebox.net> | 2023-02-24 22:51:42 +0000 |
| commit | e066422b950a06873efb6a884b47155c867b7acf (patch) | |
| tree | 833c0ac83cdb66ec50f3ef882598d3b93004cf12 /src/Game/Entities.hs | |
| parent | cf01ddef562c64dbcffa2770f50825cd97f02e3f (diff) | |
| download | space-plat-hs-e066422b950a06873efb6a884b47155c867b7acf.tar.gz space-plat-hs-e066422b950a06873efb6a884b47155c867b7acf.zip | |
Cleaned passing the collision detection function to the entities
Diffstat (limited to 'src/Game/Entities.hs')
| -rw-r--r-- | src/Game/Entities.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Game/Entities.hs b/src/Game/Entities.hs index 291f10e..d265ff5 100644 --- a/src/Game/Entities.hs +++ b/src/Game/Entities.hs @@ -30,9 +30,9 @@ mkEntities sprites m controls stateRef = do pure $ Entities sprites playerRef stateRef (player : entities) where toEntity :: IORef Entity -> M.Object -> IO Entity - toEntity playerRef (M.SlimeEntity x y) = mkSlime sprites x y playerRef (M.isBlocked m) (hitPlayer stateRef) - toEntity playerRef (M.RobotEntity x y) = mkRobot sprites x y playerRef (M.isBlocked m) (hitPlayer stateRef) - toEntity playerRef (M.BatteryEntity x y) = mkBattery sprites x y playerRef (collectedBattery stateRef) + toEntity playerRef (M.SlimeEntity x y) = mkSlime sprites x y (collision playerRef 16) (M.isBlocked m) (hitPlayer stateRef) + toEntity playerRef (M.RobotEntity x y) = mkRobot sprites x y (collision playerRef 24) (M.isBlocked m) (hitPlayer stateRef) + toEntity playerRef (M.BatteryEntity x y) = mkBattery sprites x y (collision playerRef 16) (collectedBattery stateRef) toEntity _ (M.PlayerEntity _ _) = error "Player already processed" processSpawn :: S.SpriteSheet -> Spawn -> IO Entity |