mirror of https://github.com/zeldaret/tp.git
Match JFWSystem::init (#2972)
Co-authored-by: Cuyler36 <Cuyler36@users.noreply.github.com>
This commit is contained in:
parent
f9d69372a1
commit
ac9a361676
|
|
@ -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"),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ JUTConsole* JFWSystem::systemConsole;
|
|||
|
||||
bool JFWSystem::sInitCalled = false;
|
||||
|
||||
// NONMATCHING - regalloc, equivalent
|
||||
void JFWSystem::init() {
|
||||
JUT_ASSERT(101, sInitCalled == false);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue