Merge remote-tracking branch 'origin/main' into 26-02-27-pjb-dev-2

include/JSystem/JUtility/JUTAssert.h

@@ -60,13 +60,13 @@ JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, __LINE__, MSG,
     OSPanic(__FILE__, __LINE__, "Halt");
 
 #define JUT_WARN_DEVICE(LINE, DEVICE, ...)                                                                        \
-    JUTAssertion::setWarningMessage_f(DEVICE, __FILE__, __LINE__, __VA_ARGS__);    \
+    JUTAssertion::setWarningMessage_f(DEVICE, const_cast<char*>(__FILE__), __LINE__, __VA_ARGS__);    \
 
 #define JUT_LOG(LINE, ...)                                                                         \
-    JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, __LINE__, __VA_ARGS__)
+    JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), const_cast<char*>(__FILE__), __LINE__, __VA_ARGS__)
 
 #define JUT_SET_CONFIRM(LINE, COND)                                                                \
-    JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, __LINE__, COND, #COND)
+    JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), const_cast<char*>(__FILE__), __LINE__, COND, #COND)
 
 #endif
 #define JUT_WARN(LINE, ...)                                                                        \

include/JSystem/JUtility/JUTConsole.h

@@ -103,9 +103,7 @@ public:
         return --index < 0 ? index = mMaxLines - 1 : index;
     }
 
-    int nextIndex(int index) const {
-        return ++index >= mMaxLines ? 0 : index;
-    }
+    int nextIndex(int index) const { return (++index >= mMaxLines) ? index = 0 : index; }
 
     void scrollToLastLine() { scroll(mMaxLines); }
     void scrollToFirstLine() { scroll(-mMaxLines); }

include/JSystem/JUtility/JUTFont.h

@@ -2,7 +2,7 @@
 #define JUTFONT_H
 
 #include "JSystem/JUtility/TColor.h"
-#include <string>
+#include <cstring>
 #include "dusk/endian.h"
 
 /**
@@ -124,9 +124,9 @@ public:
         return drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible);
     }
 
-    void drawString_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str,
+    f32 drawString_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str,
                           bool visible) {
-        drawString_size_scale(posX, posY, width, height, str, strlen(str), visible);
+        return (int)drawString_size_scale(posX, posY, width, height, str, strlen(str), visible);
     }
 
     int getWidth(int i_no) const {

include/JSystem/JUtility/JUTGamePad.h

@@ -286,6 +286,8 @@ struct JUTGamePadLongPress {
     /* 0x50 */ s32 field_0x50;
 };
 
-inline void JUTReadGamePad() { JUTGamePad::read(); }
+inline u32 JUTReadGamePad() {
+    return JUTGamePad::read();
+}
 
 #endif /* JUTGAMEPAD_H */

include/JSystem/JUtility/JUTGraphFifo.h

@@ -24,7 +24,11 @@ public:
         return mGpStatus[2] == false;
     }
 
-    void save() { GXSaveCPUFifo(this->mFifo); }
+    void save() {
+#if !PLATFORM_SHIELD
+        GXSaveCPUFifo(this->mFifo);
+#endif
+    }
 
     static JUTGraphFifo* sCurrentFifo;
     static bool mGpStatus[5];

include/JSystem/JUtility/JUTNameTab.h

@@ -2,6 +2,7 @@
 #define JUTNAMETAB_H
 
 #include <dolphin/types.h>
+#include "dusk/endian.h"
 
 /**
 * @ingroup jsystem-jutility

include/JSystem/JUtility/JUTXfb.h

@@ -75,7 +75,7 @@ private:
     static JUTXfb* sManager;
 
 private:
-    /* 0x00 */ void* mBuffer[3];
+    /* 0x00 */ u8* mBuffer[3];
     /* 0x0C */ bool mXfbAllocated[3];
     /* 0x10 */ s32 mBufferNum;
     /* 0x14 */ s16 mDrawingXfbIndex;