nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bump lus/support lus changes (#4701)

Browse Source
This commit is contained in:
briaguya
2024-12-16 21:12:45 -05:00
committed by GitHub
parent e1a53a77d4
commit 5d978c11c4
17 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@@ -1224,7 +1224,7 @@ void ItemTrackerWindow::DrawElement() {
int iconSpacing = CVarGetInteger(CVAR_TRACKER_ITEM("IconSpacing"), 12);
int comboButton1Mask = buttonMap[CVarGetInteger(CVAR_TRACKER_ITEM("ComboButton1"), TRACKER_COMBO_BUTTON_L)];
int comboButton2Mask = buttonMap[CVarGetInteger(CVAR_TRACKER_ITEM("ComboButton2"), TRACKER_COMBO_BUTTON_R)];
OSContPad* buttonsPressed = Ship::Context::GetInstance()->GetControlDeck()->GetPads();
OSContPad* buttonsPressed = std::dynamic_pointer_cast<LUS::ControlDeck>(Ship::Context::GetInstance()->GetControlDeck())->GetPads();
bool comboButtonsHeld = buttonsPressed != nullptr && buttonsPressed[0].button & comboButton1Mask && buttonsPressed[0].button & comboButton2Mask;
bool isPaused = CVarGetInteger(CVAR_TRACKER_ITEM("ShowOnlyPaused"), 0) == 0 || gPlayState != nullptr && gPlayState->pauseCtx.state > 0;