Merge pull request #298 from Azaezel/alpha40_triggerTroubleTre

fix for trigger::testobjects vector population
This commit is contained in:
Brian Roberts 2020-08-21 07:28:40 -05:00 committed by GitHub
commit 93ce5d0cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -394,8 +394,12 @@ bool Trigger::setTickCmd(void *object, const char *index, const char *data)
void Trigger::testObjects() void Trigger::testObjects()
{ {
Vector<SceneObject*> foundobjs; Vector<SceneObject*> foundobjs;
gServerContainer.findObjectList(getWorldBox(), 0xFFFFFFFF, &foundobjs); foundobjs.clear();
for (S32 i = 0; i < foundobjs.size(); ++i) if (getSceneManager() && getSceneManager()->getContainer() && getSceneManager()->getZoneManager())
getSceneManager()->getContainer()->findObjectList(getWorldBox(), 0xFFFFFFFF, &foundobjs);
else return;
for (S32 i = 0; i < foundobjs.size(); i++)
{ {
GameBase* so = dynamic_cast<GameBase*>(foundobjs[i]); GameBase* so = dynamic_cast<GameBase*>(foundobjs[i]);
if (so) if (so)