diff --git a/sources/Component/Collision/CollisionComponent.hpp b/sources/Component/Collision/CollisionComponent.hpp index e4244a7a..0190a56a 100644 --- a/sources/Component/Collision/CollisionComponent.hpp +++ b/sources/Component/Collision/CollisionComponent.hpp @@ -19,7 +19,8 @@ namespace BBM enum CollidedAxis { X = 1, Y = 2, - Z = 4 + Z = 4, + ALL = 7 }; //! @brief onCollide functions to be called diff --git a/sources/Items/Bonus.cpp b/sources/Items/Bonus.cpp index 32267389..f21cf1b4 100644 --- a/sources/Items/Bonus.cpp +++ b/sources/Items/Bonus.cpp @@ -12,7 +12,7 @@ namespace BBM { void Bonus::BombUpBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis) { - if (bonus.shouldDelete() || axis != 7) + if (bonus.shouldDelete() || axis != CollisionComponent::CollidedAxis::ALL) return; auto *bombHolder = player.tryGetComponent(); if (!bombHolder) @@ -22,7 +22,7 @@ namespace BBM { void Bonus::ExplosionRangeBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis) { - if (bonus.shouldDelete() || axis != 7) + if (bonus.shouldDelete() || axis != CollisionComponent::CollidedAxis::ALL) return; auto *bombHolder = player.tryGetComponent(); auto *playerBonus = player.tryGetComponent(); @@ -33,7 +33,7 @@ namespace BBM { void Bonus::SpeedUpBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis) { - if (bonus.shouldDelete() || axis != 7) + if (bonus.shouldDelete() || axis != CollisionComponent::CollidedAxis::ALL) return; auto *controllable = player.tryGetComponent(); auto *playerBonus = player.tryGetComponent(); @@ -45,7 +45,7 @@ namespace BBM { void Bonus::NoClipBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis) { - if (bonus.shouldDelete() || axis != 7) + if (bonus.shouldDelete() || axis != CollisionComponent::CollidedAxis::ALL) return; auto *playerBonus = player.tryGetComponent(); if (!playerBonus)