wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Delay trigger's onExit script execution

Browse source
This commit is contained in:
Vsevolod Kremianskii 2020-11-16 01:26:40 +07:00
parent 7c549f9b0e
commit f8bceecf3a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/object/trigger.cpp
View file

@ -74,16 +74,16 @@ void Trigger::update(float dt) {
set<shared_ptr<SpatialObject>> tenantsToRemove;
for (auto &tenant : _tenants) {
glm::vec2 position2d(tenant->position());
if (isIn(position2d)) continue;
if (tenant) {
glm::vec2 position2d(tenant->position());
if (isIn(position2d)) continue;
}
tenantsToRemove.insert(tenant);
}
for (auto &tenant : tenantsToRemove) {
if (!_blueprint->onExit().empty()) {
runScript(_blueprint->onExit(), id(), tenant->id(), -1);
}
}
for (auto &tenant : tenantsToRemove) {
_tenants.erase(tenant);
}
}