mirror of https://github.com/AxioDL/metaforce.git
CScriptTrigger: Remove HoTE progression hack
This commit is contained in:
parent
6e7d123389
commit
3a28933ffd
|
@ -25,15 +25,7 @@ CScriptTrigger::CScriptTrigger(TUniqueId uid, std::string_view name, const CEnti
|
||||||
, x148_26_deactivateOnEntered(deactivateOnEntered)
|
, x148_26_deactivateOnEntered(deactivateOnEntered)
|
||||||
, x148_27_deactivateOnExited(deactivateOnExited) {
|
, x148_27_deactivateOnExited(deactivateOnExited) {
|
||||||
SetCallTouch(false);
|
SetCallTouch(false);
|
||||||
#ifdef NDEBUG
|
#ifndef NDEBUG
|
||||||
// FIXME: HACK This fixes the HotE softlock, definitely need to look into the morphball's collision codepath and
|
|
||||||
// FIXME: determine the proper fix
|
|
||||||
if (GetEditorId() == 0x0034004B) {
|
|
||||||
Log.report(logvisor::Warning, FMT_STRING("BUG THIS!: Overriding forceField.x() for trigger {} in area {}"),
|
|
||||||
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
|
// 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()) {
|
if (GetEditorId() == 0x000B01DB && !GetActive()) {
|
||||||
Log.report(logvisor::Warning, FMT_STRING("BUG THIS!: Overriding active for trigger {} in area {}"), GetEditorId(),
|
Log.report(logvisor::Warning, FMT_STRING("BUG THIS!: Overriding active for trigger {} in area {}"), GetEditorId(),
|
||||||
|
|
Loading…
Reference in New Issue