Merge branch 'main' of https://github.com/zeldaret/tp into compile

include/JSystem/JUtility/JUTAssert.h

@@ -23,7 +23,7 @@
 
 #define JUT_PANIC_F(LINE, MSG, ...)                                                               \
     JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__);        \
-    OSPanic(__FILE__, LINE, MSG, __VA_ARGS__);
+    OSPanic(__FILE__, LINE, "Halt");
 
 #define JUT_WARN_DEVICE(LINE, DEVICE, ...)                                                                        \
     JUTAssertion::setWarningMessage_f(DEVICE, __FILE__, LINE, __VA_ARGS__);    \
@@ -63,7 +63,7 @@ namespace JUTAssertion {
 
     u32 getSDevice();
     void showAssert_f(u32 device, const char* file, int line, const char* msg, ...);
-    void showAssert_f_va(u32 device, const char* file, int line, const char* msg, __va_list args);
+    void showAssert_f_va(u32 device, const char* file, int line, const char* msg, va_list args);
     void setWarningMessage_f(u32 device, char * file, int line, const char * fmt, ...);
     void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args);
     void setLogMessage_f(u32 device, char* file, int line, const char* fmt, ...);

include/JSystem/JUtility/JUTConsole.h

@@ -4,7 +4,7 @@
 #include "JSystem/JGadget/linklist.h"
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include <stdarg>
+#include <cstdarg>
 
 /**
 * @ingroup jsystem-jutility

include/JSystem/JUtility/JUTDirectPrint.h

@@ -2,7 +2,7 @@
 #define JUTDIRECTPRINT_H
 
 #include "JSystem/JUtility/TColor.h"
-#include <stdarg>
+#include <cstdarg>
 
 /**
 * @ingroup jsystem-jutility

include/JSystem/JUtility/JUTException.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include <stdarg>
+#include <cstdarg>
 #include <dolphin/gx.h>
 #include <dolphin/os.h>
 #include "global.h"

include/JSystem/JUtility/JUTProcBar.h

@@ -30,7 +30,8 @@ public:
         }
 
         void end() {
-            mCost = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 / 4) / 125000);
+            OSTick diff = OSGetTick() - mTick;
+            mCost = OSTicksToMicroseconds(diff);
             if (mCost == 0) {
                 mCost = 1;
             }
@@ -94,7 +95,7 @@ public:
     void wholeLoopEnd() { mWholeLoop.end(); }
     void idleStart() { mIdle.start(255, 129, 30); }
     void idleEnd() { mIdle.end(); }
-    void setCostFrame(int frame) { mCostFrame = frame; }
+    void setCostFrame(int frame) { sManager->mCostFrame = frame; }
     void setVisible(bool visible) { mVisible = visible; }
     void setVisibleHeapBar(bool visible) { mHeapBarVisible = visible; }
     void setWatchHeap(JKRHeap* pHeap) { mWatchHeap = pHeap; }

include/JSystem/JUtility/JUTTexture.h

@@ -2,7 +2,7 @@
 #define JUTTEXTURE_H
 
 #include <dolphin/gx.h>
-#include <stdint>
+#include <stdint.h>
 
 class JUTPalette;
 

include/JSystem/JUtility/JUTVideo.h

@@ -36,8 +36,8 @@ public:
         width = (u16)getFbWidth();
         height = (u16)getEfbHeight();
     }
-    u16 getXfbHeight() const { return mRenderObj->xfbHeight; }
-    u32 isAntiAliasing() const { return mRenderObj->aa; }
+    u16 getXfbHeight() const { return u16(mRenderObj->xfbHeight); }
+    u8 isAntiAliasing() const { return u8(mRenderObj->aa); }
     Pattern getSamplePattern() const { return mRenderObj->sample_pattern; }
     u8* getVFilter() const { return mRenderObj->vfilter; }
     OSMessageQueue* getMessageQueue() { return &mMessageQueue; }

include/JSystem/JUtility/JUTXfb.h

@@ -45,15 +45,23 @@ public:
     }
 
     void* getDrawingXfb() const {
-        if (mDrawingXfbIndex >= 0)
-            return mBuffer[mDrawingXfbIndex];
-        return NULL;
+        void* result;
+        if (mDrawingXfbIndex >= 0) {
+            result = mBuffer[mDrawingXfbIndex];
+        } else {
+            result = NULL;
+        }
+        return result;
     }
 
     void* getDisplayingXfb() const {
-        if (mDisplayingXfbIndex >= 0)
-            return mBuffer[mDisplayingXfbIndex];
-        return NULL;
+        void* xfb;
+        if (mDisplayingXfbIndex >= 0) {
+            xfb = mBuffer[mDisplayingXfbIndex];
+        } else {
+            xfb = NULL;
+        }
+        return xfb;
     }
 
     void setDisplayingXfbIndex(s16 index) { mDisplayingXfbIndex = index; }