diff options
Diffstat (limited to 'src/d/lyt')
| -rw-r--r-- | src/d/lyt/meter/d_lyt_meter.cpp | 13 | ||||
| -rw-r--r-- | src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/d/lyt/meter/d_lyt_meter.cpp b/src/d/lyt/meter/d_lyt_meter.cpp index 4de66635..25798d54 100644 --- a/src/d/lyt/meter/d_lyt_meter.cpp +++ b/src/d/lyt/meter/d_lyt_meter.cpp @@ -1179,8 +1179,9 @@ void dLytMeterMain_c::checkPaneVisibility() { || (MinigameManager::isInMinigameState(MinigameManager::TRIAL_TIME_ATTACK) && LytDoButtonRelated::get(LytDoButtonRelated::DO_BUTTON_B) == LytDoButtonRelated::ACT_IE_NONE) || - (dLytMeter_c::getField_0x13B66() || (shouldBeHiddenGeneral() && !mItemSelect.fn_800F02F0() && !isDoingSkyKeepPuzzle()) || - isInModeMap() || isInModePause())) { + (dLytMeter_c::getField_0x13B66() || + (shouldBeHiddenGeneral() && !mItemSelect.fn_800F02F0() && !isDoingSkyKeepPuzzle()) || isInModeMap() || + isInModePause())) { mPanesVisible[METER_ANIM_ITEM_SELECT] = false; } @@ -1278,7 +1279,8 @@ void dLytMeterMain_c::checkPaneVisibility() { MinigameManager::isInMinigameState(MinigameManager::TRIAL_TIME_ATTACK) || MinigameManager::isInMinigameState(MinigameManager::PUMPKIN_ARCHERY) || MinigameManager::isInMinigameState(MinigameManager::SPIRAL_CHARGE_TUTORIAL) || - MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER) || shouldBeHiddenGeneral() || mIsInSwordDrawEvent) + MinigameManager::isInMinigameState(MinigameManager::ROLLERCOASTER) || shouldBeHiddenGeneral() || + mIsInSwordDrawEvent) || (dLytMeter_c::getField_0x13B66() || fn_800D5420() || (dLytSimpleWindow_c::getInstance() != nullptr && dLytSimpleWindow_c::getInstance()->isOutputText()) || @@ -1352,7 +1354,7 @@ void dLytMeterMain_c::checkPaneVisibility() { } } - if ((dAcPy_c::GetLink()->hasvt_0x1C0() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) || + if ((dAcPy_c::GetLink()->isBeetleInFlight() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) || (shouldBeHiddenGeneral() && !mHelpOpen) || mGanbariGauge.fn_80104760() || MinigameManager::isInMinigameState(MinigameManager::FUN_FUN_ISLAND) || @@ -1490,7 +1492,8 @@ void dLytMeterMain_c::checkPaneVisibility() { if (!field_0x137B2 || dLytAreaCaption_c::getVisible() || fn_800D5380(false) || MinigameManager::isInAnyMinigame() || mIsInSwordDrawEvent - || shouldBeHiddenGeneral() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || isInModeMap() || isInModePause()) { + || shouldBeHiddenGeneral() || dLytMeter_c::getField_0x13B66() || fn_800D5420() || isInModeMap() || + isInModePause()) { mDrinkVisible = false; } diff --git a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp index da100999..6a7d7618 100644 --- a/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp +++ b/src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp @@ -600,7 +600,7 @@ bool dLytMeterGanbariGauge_c::execute() { mAnm[GANBARI_ANIM_DRINK].setFrame(drinkFrame); mAnm[GANBARI_ANIM_DRINK].setAnimEnable(true); - if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->hasvt_0x1C0() && + if (!EventManager::isInEvent() && !dAcPy_c::GetLink()->isBeetleInFlight() && !dAcPy_c::GetLink()->checkActionFlagsCont(0x10) && (d3d::isOnScreen(dAcPy_c::GetLink()->mPositionCopy3) || fn_80104710(false) || isCrawling()) && *mStateMgrWheel.getStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_InvisibleWait && @@ -609,7 +609,7 @@ bool dLytMeterGanbariGauge_c::execute() { } else if (!EventManager::isInEvent() && *mStateMgrWheel.getStateID() == StateID_Full && *mStateMgrWheel.getOldStateID() != StateID_Full && *mStateMgrMain.getStateID() == StateID_Wait) { mStateMgrMain.changeState(StateID_OutWait); - } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->hasvt_0x1C0() || + } else if ((EventManager::isInEvent() || dAcPy_c::GetLink()->isBeetleInFlight() || dAcPy_c::GetLink()->checkActionFlagsCont(0x10) || (!d3d::isOnScreen(dAcPy_c::GetLink()->mPositionCopy3) && !fn_80104710(false) && !isCrawling())) && *mStateMgrMain.getStateID() == StateID_Wait) { |