From b3e4ab13cabbad029d79e97b3643201f33d1b9da Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Sun, 17 Dec 2023 21:25:49 -0500 Subject: [PATCH] Update RT64 to fix crash caused by offset scissors going into negative coordinate ranges --- lib/RT64-HLE | 2 +- patches/ui_patches.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/RT64-HLE b/lib/RT64-HLE index f35e09b..93462c6 160000 --- a/lib/RT64-HLE +++ b/lib/RT64-HLE @@ -1 +1 @@ -Subproject commit f35e09b110c38517f8e57337bad17734f5f65dca +Subproject commit 93462c612300d342ac84110f4d0627386785b8bc diff --git a/patches/ui_patches.c b/patches/ui_patches.c index f7f9e48..bf0b1ef 100644 --- a/patches/ui_patches.c +++ b/patches/ui_patches.c @@ -129,7 +129,7 @@ void Interface_Draw(PlayState* play) { if (pauseCtx->debugEditor == DEBUG_EDITOR_NONE) { Interface_SetVertices(play); // @recomp Adjust any scissors to cover the whole screen - gEXSetScissorAlign(OVERLAY_DISP++, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_RIGHT, 0, -margin_reduction, -SCREEN_WIDTH, margin_reduction); + gEXSetScissorAlign(OVERLAY_DISP++, G_EX_ORIGIN_LEFT, G_EX_ORIGIN_RIGHT, 0, -margin_reduction, -SCREEN_WIDTH, margin_reduction, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); Interface_SetOrthoView(interfaceCtx); // Draw Grandma's Story @@ -470,7 +470,7 @@ void Interface_Draw(PlayState* play) { // @recomp Restore normal alignment and shift down for minigame countdown or clock gEXSetRectAlign(OVERLAY_DISP++, G_EX_ORIGIN_NONE, G_EX_ORIGIN_NONE, 0, 0, 0, 0); gEXSetViewportAlign(OVERLAY_DISP++, G_EX_ORIGIN_NONE, 0, 0); - gEXSetScissorAlign(OVERLAY_DISP++, G_EX_ORIGIN_NONE, G_EX_ORIGIN_NONE, 0, 0, 0, 0); + gEXSetScissorAlign(OVERLAY_DISP++, G_EX_ORIGIN_NONE, G_EX_ORIGIN_NONE, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); Interface_SetOrthoView(interfaceCtx); }