diff --git a/Flakkari/Engine/EntityComponentSystem/Components/Components3D.hpp b/Flakkari/Engine/EntityComponentSystem/Components/Components3D.hpp index 1b33dad2..216883ce 100644 --- a/Flakkari/Engine/EntityComponentSystem/Components/Components3D.hpp +++ b/Flakkari/Engine/EntityComponentSystem/Components/Components3D.hpp @@ -10,7 +10,7 @@ * https://opensource.org/licenses/MIT * © 2023 @MasterLaplace * @version 0.4.0 - * @date 2024-01-06 + * @date 2024-11-11 **************************************************************************/ #ifndef FLAKKARI_COMPONENTS3D_HPP_ diff --git a/Flakkari/Engine/EntityComponentSystem/Systems/Systems.cpp b/Flakkari/Engine/EntityComponentSystem/Systems/Systems.cpp index 9a336ffc..4b393dc6 100644 --- a/Flakkari/Engine/EntityComponentSystem/Systems/Systems.cpp +++ b/Flakkari/Engine/EntityComponentSystem/Systems/Systems.cpp @@ -310,8 +310,8 @@ void handle_collisions(Registry &r) if (!pos2.has_value() || !tag2.has_value()) continue; - if ((tag1->tag == "Player" && tag2->tag == "Enemy") || - (tag2->tag == "Player" && tag1->tag == "Enemy") && (scol1.has_value() && scol2.has_value())) + if (((tag1->tag == "Player" && tag2->tag == "Enemy") || (tag2->tag == "Player" && tag1->tag == "Enemy")) && + scol1.has_value() && scol2.has_value()) { if (SphereCollisions(pos1.value(), scol1.value(), pos2.value(), scol2.value())) {