From ac9a361676852f28a968add1e7919250fcb358d7 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 19 Dec 2025 20:25:09 -0500 Subject: [PATCH] Match JFWSystem::init (#2972) Co-authored-by: Cuyler36 --- configure.py | 2 +- include/JSystem/JUtility/JUTConsole.h | 3 ++- src/JSystem/JFramework/JFWSystem.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index 4a6a774d98c..7b7c9b869f3 100755 --- a/configure.py +++ b/configure.py @@ -935,7 +935,7 @@ config.libs = [ JSystemLib( "JFramework", [ - Object(MatchingFor("ShieldD"), "JSystem/JFramework/JFWSystem.cpp"), # retail-only regalloc + Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JFramework/JFWSystem.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JFramework/JFWDisplay.cpp"), ], ), diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 9ed5c413e7a..cb65d1091c7 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -58,7 +58,8 @@ public: } void setFont(JUTFont* p_font) { - mFont = p_font; + // Fakematch...? Fixes GCN but breaks Wii. TODO: Test after Wii flags are fixed. + p_font = mFont = p_font; setFontSize(p_font->getWidth(), p_font->getHeight()); } diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 3246e6224c9..c41f7ffc8f2 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -60,7 +60,6 @@ JUTConsole* JFWSystem::systemConsole; bool JFWSystem::sInitCalled = false; -// NONMATCHING - regalloc, equivalent void JFWSystem::init() { JUT_ASSERT(101, sInitCalled == false);