mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-16 08:45:27 +00:00
fix(proximity): a proximity set again replaces the old one; UnsetProximityRadius
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -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<LWOOBJID>& ProximityMonitorComponent::GetProximityObjects(const std::string& name) const {
|
||||
const auto iter = m_ProximitiesData.find(name);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user