fix trigger loading (#838)

Fixes #836
This commit is contained in:
Aaron Kimbrell 2022-11-14 12:55:40 -06:00 committed by GitHub
parent 53b559bef3
commit 37524af549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -234,7 +234,7 @@ void Zone::LoadScene(std::istream& file) {
std::string luTriggersPath = scene.filename.substr(0, scene.filename.size() - 4) + ".lutriggers"; std::string luTriggersPath = scene.filename.substr(0, scene.filename.size() - 4) + ".lutriggers";
std::vector<LUTriggers::Trigger*> triggers; std::vector<LUTriggers::Trigger*> triggers;
if(Game::assetManager->HasFile(luTriggersPath.c_str())) triggers = LoadLUTriggers(luTriggersPath, scene.id); if(Game::assetManager->HasFile((m_ZonePath + luTriggersPath).c_str())) triggers = LoadLUTriggers(luTriggersPath, scene.id);
for (LUTriggers::Trigger* trigger : triggers) { for (LUTriggers::Trigger* trigger : triggers) {
scene.triggers.insert({ trigger->id, trigger }); scene.triggers.insert({ trigger->id, trigger });