nanopenguin/SDL_Minigame
0
0
Fork 0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 13:43:41 +00:00
Code Actions Wiki

fix errors when building

Browse Source
This commit is contained in:
ineslelin 2025-01-14 13:24:33 +01:00
parent 7e0a2422bd
commit b07d68b84b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/InteractionComponent.h
View File

@ -4,6 +4,7 @@
#include "Entity.h" #include "Entity.h"
#include <vector> #include <vector>
#include <functional>
class InteractionComponent : public Component class InteractionComponent : public Component
{ {
@ -12,7 +13,7 @@ public:
~InteractionComponent(); ~InteractionComponent();
void init() override; void init() override;
void update() override; void update();
bool interact(Entity* interactor, Entity* interactee); bool interact(Entity* interactor, Entity* interactee);

6
src/InteractionComponent.cpp
View File

@ -44,18 +44,18 @@ Entity* InteractionComponent::findClosestEntity(std::vector<Entity*>& entities,
auto isInDirection = getDirectionalCheck(direction, interactorT); auto isInDirection = getDirectionalCheck(direction, interactorT);
entities.erase(std::remove_if(entities.begin(), entities.end(), [&](Entity* e){ entities.erase(std::remove_if(entities.begin(), entities.end(), [&](Entity* e){
auto& entityT = entity->getComponent<TransformComponent>(); auto& entityT = e->getComponent<TransformComponent>();
return !isInDirection(entityT) || !isEntityCloseEnough(interactorT, entityT, direction); return !isInDirection(entityT) || !isEntityCloseEnough(interactorT, entityT, direction);
}), entities.end()); }), entities.end());
for(auto e : entities) for(auto e : entities)
{ {
auto& entityT = entity->getComponent<TransformComponent>(); auto& entityT = e->getComponent<TransformComponent>();
float distance = calculateDistance(interactorT.position, entityT.position); float distance = calculateDistance(interactorT.position, entityT.position);
if (distance < closestDistance) { if (distance < closestDistance) {
closestDistance = distance; closestDistance = distance;
closestEntity = entity; closestEntity = e;
} }
} }