diff options
| author | lightmanLP <liteman1000@gmail.com> | 2026-11-03 04:21:45 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-02 15:21:45 -0600 |
| commit | eb89f12b26b03babcda4b2fcfa8714ec534d853d (patch) | |
| tree | 1da4e5571ca91302bfe296a3010e6430c0a56b72 /mm/src/code | |
| parent | 2ee1fe1266f65bcfdff4390a3eb15b35d62d5d03 (diff) | |
[Enhancement] Trigger active item on B (#1870)
* proto
* proto 2
* proto 3
* proto 4
* small fix and cleanup
* clang format
* ptr fix
* possible fix for active item with cycle
* strip gfs enhancement
* strip redundant horse check
* small cleanup
* fix button holding
* prevent instant putaway
* cvar cleanup
* B bomb arrow fix
* fix hook reset to neutral
* config migration
* icon for B item
* clang fmt
* fix third person items stripping on dpad
* Apply from review
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* clang fmt
* missed one
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
* Revert "missed one"
This reverts commit 1c8312cede581cd1fed68d8d3c703c67d3bcbcde.
Because, apparently, I'm not
* fix
* stricter check
* add isDpad to hook
* add dpad checks
* clang fmt
* Update mm/2s2h/config/ConfigUpdaters.cpp
* Update mm/2s2h/config/ConfigUpdaters.cpp
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_player_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/src/code/z_player_lib.c b/mm/src/code/z_player_lib.c index ae0d313f9..c6b939cbf 100644 --- a/mm/src/code/z_player_lib.c +++ b/mm/src/code/z_player_lib.c @@ -780,7 +780,7 @@ ItemId Player_Dpad_GetItemOnButton(PlayState* play, Player* player, DpadEquipSlo } ItemId item = DPAD_BTN_ITEM(slot); - GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item); + GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item, true); return item; } // #endregion @@ -793,7 +793,7 @@ ItemId Player_GetItemOnButton(PlayState* play, Player* player, EquipSlot slot) { if (slot == EQUIP_SLOT_B) { ItemId item = Inventory_GetBtnBItem(play); - GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item); + GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item, false); if (item >= ITEM_FD) { return item; @@ -819,20 +819,20 @@ ItemId Player_GetItemOnButton(PlayState* play, Player* player, EquipSlot slot) { if (slot == EQUIP_SLOT_C_LEFT) { ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_LEFT); - GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item); + GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item, false); return item; } if (slot == EQUIP_SLOT_C_DOWN) { ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_DOWN); - GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item); + GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item, false); return item; } // EQUIP_SLOT_C_RIGHT { ItemId item = C_BTN_ITEM(EQUIP_SLOT_C_RIGHT); - GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item); + GameInteractor_Should(VB_GET_ITEM_ON_BUTTON, item, slot, &item, false); return item; } } |