Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-06 18:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge RC script from differnt branch

Browse Source 
Add wandering vendor script
Update proximity monitors to move with their respective entityies
This commit is contained in:
Aaron Kimbre
2023-08-15 14:35:35 -05:00
parent e35b95f3c8
commit 691a42ba20
14 changed files with 98 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dGame/dComponents/ProximityMonitorComponent.cpp
View File

@@ -61,17 +61,17 @@ bool ProximityMonitorComponent::IsInProximity(const std::string& name, LWOOBJID
}
void ProximityMonitorComponent::Update(float deltaTime) {
for (const auto& prox : m_ProximitiesData) {
if (!prox.second) continue;
for (const auto& [name, dpentity] : m_ProximitiesData) {
if (!dpentity) continue;
dpentity->SetPosition(m_Parent->GetPosition());
//Process enter events
for (auto* en : prox.second->GetNewObjects()) {
m_Parent->OnCollisionProximity(en->GetObjectID(), prox.first, "ENTER");
for (auto* en : dpentity->GetNewObjects()) {
m_Parent->OnCollisionProximity(en->GetObjectID(), name, "ENTER");
}
//Process exit events
for (auto* en : prox.second->GetRemovedObjects()) {
m_Parent->OnCollisionProximity(en->GetObjectID(), prox.first, "LEAVE");
for (auto* en : dpentity->GetRemovedObjects()) {
m_Parent->OnCollisionProximity(en->GetObjectID(), name, "LEAVE");
}
}
}