2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-21 07:39:13 +00:00

Merge remote-tracking branch 'origin/main' into wgpu

# Conflicts:
#	extern/boo
This commit is contained in:
2022-02-08 03:46:22 -05:00
38 changed files with 621 additions and 442 deletions

View File

@@ -33,6 +33,13 @@ CScriptTrigger::CScriptTrigger(TUniqueId uid, std::string_view name, const CEnti
GetEditorId(), GetAreaIdAlways());
x11c_forceField.x() = 0.f;
}
#else
// HACK: For some reason MetroidPrime's lair doesn't enable this trigger until after the cutscene, activate it in debug build
if (GetEditorId() == 0x000B01DB && !GetActive()) {
Log.report(logvisor::Warning, FMT_STRING("BUG THIS!: Overriding active for trigger {} in area {}"), GetEditorId(),
GetAreaIdAlways());
SetActive(true);
}
#endif
}