From a9a6c57fa515164628b1ab85e2db87026913d9cd Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 21 Dec 2023 13:07:11 -0800
Subject: [PATCH] JUTDirectPrint match

found by SwareJonge
---
 configure.py                            | 2 +-
 src/JSystem/JUtility/JUTDirectPrint.cpp | 3 ++-
 src/JSystem/JUtility/JUTException.cpp   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.py b/configure.py
index eaa6e0b5d..5bd619418 100644
--- a/configure.py
+++ b/configure.py
@@ -822,7 +822,7 @@ config.libs = [
             Object(Matching,    "JSystem/JUtility/JUTDbPrint.cpp"),
             Object(Matching,    "JSystem/JUtility/JUTGamePad.cpp"),
             Object(NonMatching, "JSystem/JUtility/JUTException.cpp"),
-            Object(NonMatching, "JSystem/JUtility/JUTDirectPrint.cpp"),
+            Object(Matching,    "JSystem/JUtility/JUTDirectPrint.cpp"),
             Object(Matching,    "JSystem/JUtility/JUTAssert.cpp"),
             Object(Matching,    "JSystem/JUtility/JUTVideo.cpp"),
             Object(Matching,    "JSystem/JUtility/JUTXfb.cpp"),
diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp
index 9c092fc4d..3e68a7b18 100644
--- a/src/JSystem/JUtility/JUTDirectPrint.cpp
+++ b/src/JSystem/JUtility/JUTDirectPrint.cpp
@@ -107,7 +107,8 @@ void JUTDirectPrint::drawChar(int position_x, int position_y, int ch) {
             for (int y2 = 0; y2 < scale_y; y2++) {
                 int tmp = mStride * y2;
                 for (int x2 = 0; x2 < scale_x; x2++) {
-                    pixel[x2 + tmp] = value;
+                    u16* row = &pixel[tmp];
+                    row[x2] = value;
                 }
             }
 
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 7eb2a9de2..2c8ba35e4 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -10,6 +10,7 @@
 #include "MSL_C/math.h"
 #include "MSL_C/stdio.h"
 #include "MSL_C/stdlib.h"
+#include "MSL_C/new.h"
 #include "dolphin/base/PPCArch.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OS.h"