From d81ecc242ff88ffd49e0b5296dfb23ab54a0cd78 Mon Sep 17 00:00:00 2001 From: JAROWMR Date: Tue, 19 Nov 2024 20:51:51 +0100 Subject: merge with master --- src/crepe/system/CollisionSystem.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/crepe/system/CollisionSystem.h b/src/crepe/system/CollisionSystem.h index f3242b1..0518b34 100644 --- a/src/crepe/system/CollisionSystem.h +++ b/src/crepe/system/CollisionSystem.h @@ -10,12 +10,15 @@ #include "api/Vector2.h" #include "Collider.h" +#include "System.h" namespace crepe { //! A system responsible for detecting and handling collisions between colliders. -class CollisionSystem { +class CollisionSystem : public System { +public: + using System::System; private: //! A variant type that can hold either a BoxCollider or a CircleCollider. @@ -70,7 +73,7 @@ public: CollisionSystem(); //! Updates the collision system by checking for collisions between colliders and handling them. - void update(); + void update() override; private: /** -- cgit v1.2.3