diff options
| author | robojumper <robojumper@gmail.com> | 2025-11-23 15:59:09 +0100 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-11-23 16:00:59 +0100 |
| commit | 88075f00a9a1e021f3eb0e9b88e86a8396ceac17 (patch) | |
| tree | 2d5ce963d4d14e863caaeaf1aaeca1e373547ff0 /src/d/lyt/meter | |
| parent | 57557d11285aeff9ffd86c6e57fdc09b62b391d1 (diff) | |
d_lyt_control_game OK
Diffstat (limited to 'src/d/lyt/meter')
| -rw-r--r-- | src/d/lyt/meter/d_lyt_meter.cpp | 2 | ||||
| -rw-r--r-- | src/d/lyt/meter/d_lyt_meter_cross_btn.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/d/lyt/meter/d_lyt_meter.cpp b/src/d/lyt/meter/d_lyt_meter.cpp index 3d7382b7..8c962391 100644 --- a/src/d/lyt/meter/d_lyt_meter.cpp +++ b/src/d/lyt/meter/d_lyt_meter.cpp @@ -1088,7 +1088,7 @@ bool dLytMeterMain_c::fn_800D56B0() { } if ((EventManager::isInEvent() && field_0x1377E == 0 && dAcPy_c::GetLink()->getCurrentAction() != 0x8C && - dMessage_c::getInstance()->getField_0x32C() == 0xC) || + dMessage_c::getInstance()->getMapEvent() == dLytMapMain_c::MAP_EVENT_MAX) || mHelpOpen) { return true; } diff --git a/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp b/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp index 34c25f6e..4144671b 100644 --- a/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp +++ b/src/d/lyt/meter/d_lyt_meter_cross_btn.cpp @@ -5,6 +5,7 @@ #include "d/d_message.h" #include "d/flag/storyflag_manager.h" #include "d/lyt/d2d.h" +#include "d/lyt/d_lyt_map.h" #include "d/lyt/d_lyt_unknowns.h" #include "d/lyt/meter/d_lyt_meter.h" #include "d/snd/d_snd_small_effect_mgr.h" @@ -172,8 +173,8 @@ void dLytMeterCrossBtnParts_c::execute(bool bIsVisible) { mpLyt->calc(); } - if ((EventManager::isInEvent() && dMessage_c::getInstance()->getField_0x32C() == 12 && !checkIsInSkykeepPuzzle() && - !dLytMeter_c::GetInstance()->fn_800D5670()) || + if ((EventManager::isInEvent() && dMessage_c::getInstance()->getMapEvent() == dLytMapMain_c::MAP_EVENT_MAX && + !checkIsInSkykeepPuzzle() && !dLytMeter_c::GetInstance()->fn_800D5670()) || ((dLytMeter_c::getItemSelect0x75A2() && (mIndex != 1 || mCurrentIcon != 0)) || !bIsVisible)) { field_0x7C = 0; |