diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:19:29 -0500 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-10-06 00:19:29 -0500 |
| commit | ab30ca1617c12cf2e192d339af1269332976278c (patch) | |
| tree | c22612397c6d0a8325be224de412ca8a819d6ffe /mm/src/code/z_parameter.c | |
| parent | 79c99c0ff798967b45082645d04d51c430013c7a (diff) | |
| parent | da793a5bf2c8cbdcb6adcf904068b17d53260fb7 (diff) | |
Merge branch 'develop' of garrettjoecox.github.com:HarbourMasters/2ship2harkinian into develop-rando
Diffstat (limited to 'mm/src/code/z_parameter.c')
| -rw-r--r-- | mm/src/code/z_parameter.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c index b53dcdbf8..13c5e2901 100644 --- a/mm/src/code/z_parameter.c +++ b/mm/src/code/z_parameter.c @@ -20,7 +20,7 @@ #include <string.h> #include "BenGui/HudEditor.h" #include "2s2h_assets.h" -#include "Enhancements/GameInteractor/GameInteractor.h" +#include "2s2h/GameInteractor/GameInteractor.h" // 2S2H [Port] This was originally static but needs to be global so it can be accessed in z_kaleido_collect, // z_kaleido_debug, and z_kaleido_draw. @@ -2782,8 +2782,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) { for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) { // Individual C button ItemId itemId = GET_CUR_FORM_BTN_ITEM(i); - if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, - !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], &itemId)) { + if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], + &itemId)) { // Item not usable in current playerForm if (gSaveContext.buttonStatus[i] != BTN_DISABLED) { gSaveContext.buttonStatus[i] = BTN_DISABLED; @@ -2929,8 +2929,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) { for (s16 j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) { // Individual D button ItemId itemId = DPAD_GET_CUR_FORM_BTN_ITEM(j); - if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, - !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], &itemId)) { + if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], + &itemId)) { // Item not usable in current playerForm if (gSaveContext.shipSaveContext.dpad.status[j] != BTN_DISABLED) { gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED; @@ -8614,7 +8614,15 @@ void Interface_Draw(PlayState* play) { Map_DrawMinimap(play); if ((R_PAUSE_BG_PRERENDER_STATE != 2) && (R_PAUSE_BG_PRERENDER_STATE != 3)) { + if (CVarGetInteger("gModes.MirroredWorld.State", 0)) { + gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.shipMirrorProjectionPtr, + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + } Target_Draw(&play->actorCtx.targetCtx, play); + if (CVarGetInteger("gModes.MirroredWorld.State", 0)) { + gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionPtr, + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + } } Gfx_SetupDL39_Overlay(play->state.gfxCtx); |