diff --git a/dGame/dComponents/ProximityMonitorComponent.cpp b/dGame/dComponents/ProximityMonitorComponent.cpp index 91b3ad738..4ec3f2737 100644 --- a/dGame/dComponents/ProximityMonitorComponent.cpp +++ b/dGame/dComponents/ProximityMonitorComponent.cpp @@ -28,6 +28,8 @@ ProximityMonitorComponent::~ProximityMonitorComponent() { } void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std::string& name, const uint32_t collisionGroup) { + // A proximity set again under its name replaces the old one + UnsetProximityRadius(name); dpEntity* en = new dpEntity(m_Parent->GetObjectID(), proxRadius); en->SetCollisionGroup(collisionGroup); en->SetPosition(m_Parent->GetPosition()); @@ -37,11 +39,19 @@ void ProximityMonitorComponent::SetProximityRadius(float proxRadius, const std:: } void ProximityMonitorComponent::SetProximityRadius(dpEntity* entity, const std::string& name) { + UnsetProximityRadius(name); dpWorld::AddEntity(entity); entity->SetPosition(m_Parent->GetPosition()); m_ProximitiesData.insert(std::make_pair(name, entity)); } +void ProximityMonitorComponent::UnsetProximityRadius(const std::string& name) { + const auto iter = m_ProximitiesData.find(name); + if (iter == m_ProximitiesData.end()) return; + if (iter->second) dpWorld::RemoveEntity(iter->second); + m_ProximitiesData.erase(iter); +} + const std::unordered_set& ProximityMonitorComponent::GetProximityObjects(const std::string& name) const { const auto iter = m_ProximitiesData.find(name); diff --git a/dGame/dComponents/ProximityMonitorComponent.h b/dGame/dComponents/ProximityMonitorComponent.h index e9e7a0745..8c1c64257 100644 --- a/dGame/dComponents/ProximityMonitorComponent.h +++ b/dGame/dComponents/ProximityMonitorComponent.h @@ -45,6 +45,9 @@ public: */ void SetProximityRadius(dpEntity* entity, const std::string& name); + // Removes the proximity of that name (Lua UnsetProximityRadius) + void UnsetProximityRadius(const std::string& name); + /** * Returns the last of entities that are used to check proximity, given a name * @param name the proximity name to retrieve physics objects for