mirror of
https://github.com/italicsjenga/agb.git
synced 2024-12-23 08:11:33 +11:00
nothing should get killed from overlapping the hero
This commit is contained in:
parent
7af1b01006
commit
36e912bcb0
|
@ -490,7 +490,7 @@ fn resolve_overlap(me: &Entity, other: &Entity) -> OverlapResolution {
|
||||||
(EntityType::MovableBlock, EntityType::Spikes(_)) => OverlapResolution::CoExist,
|
(EntityType::MovableBlock, EntityType::Spikes(_)) => OverlapResolution::CoExist,
|
||||||
(_, EntityType::Spikes(switch)) => resolve_spikes(switch),
|
(_, EntityType::Spikes(switch)) => resolve_spikes(switch),
|
||||||
(_, EntityType::Switch(switch)) => OverlapResolution::ToggleSystem(switch.system),
|
(_, EntityType::Switch(switch)) => OverlapResolution::ToggleSystem(switch.system),
|
||||||
(_, EntityType::Enemy(_) | EntityType::Hero(_)) => OverlapResolution::Die,
|
(_, EntityType::Enemy(_)) => OverlapResolution::Die,
|
||||||
(_, EntityType::Ice) => OverlapResolution::MoveAgain,
|
(_, EntityType::Ice) => OverlapResolution::MoveAgain,
|
||||||
(_, EntityType::Teleporter) => OverlapResolution::Teleport,
|
(_, EntityType::Teleporter) => OverlapResolution::Teleport,
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue