From 7fd2d2a12e0b01b10a6dca731290efea02d693f7 Mon Sep 17 00:00:00 2001 From: HeleneH Date: Sun, 18 Jan 2026 16:55:44 +0100 Subject: [PATCH] feat(ecs, game): add SCORE collision type and update collision rules for score entities --- ecs/src/components/Collision.hpp | 3 ++- ecs/src/systems/CollisionSystem.cpp | 2 ++ server/src/game/Game.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ecs/src/components/Collision.hpp b/ecs/src/components/Collision.hpp index bbb47271..bbe96208 100644 --- a/ecs/src/components/Collision.hpp +++ b/ecs/src/components/Collision.hpp @@ -20,7 +20,8 @@ namespace ecs { PLAYER_PROJECTILE, ENEMY_PROJECTILE, OBSTACLE, - POWER_UP + POWER_UP, + SCORE, }; class Collision: public Component { diff --git a/ecs/src/systems/CollisionSystem.cpp b/ecs/src/systems/CollisionSystem.cpp index 08d9a764..ba5d80a0 100644 --- a/ecs/src/systems/CollisionSystem.cpp +++ b/ecs/src/systems/CollisionSystem.cpp @@ -114,6 +114,8 @@ namespace ecs return true; if (a == TypeCollision::POWER_UP && (b == TypeCollision::PLAYER_PROJECTILE || b == ENEMY_PROJECTILE)) return true; + if (a == SCORE || b == SCORE) + return true; return false; } diff --git a/server/src/game/Game.cpp b/server/src/game/Game.cpp index 6023377b..19e67474 100644 --- a/server/src/game/Game.cpp +++ b/server/src/game/Game.cpp @@ -496,7 +496,7 @@ namespace server { auto scoreEntity = _ecs.createEntity(cmn::idEntityForScore); scoreEntity->addComponent(cmn::positionScoreX, cmn::positionScoreY); - scoreEntity->addComponent(ecs::TypeCollision::PLAYER, cmn::playerWidth, cmn::playerHeight); + scoreEntity->addComponent(ecs::TypeCollision::SCORE, cmn::playerWidth, cmn::playerHeight); scoreEntity->addComponent( _ecs.getResourceManager().getFont(cmn::fontPath.data()), cmn::sizeScore