Merge branch 'main' of https://github.com/TakaRikka/dusk

libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp

@@ -264,7 +264,7 @@ void J3DModelLoader::setupBBoardInfo() {
                     mpModelData->getJointNodePointer(i)->setMtxType(0);
                     break;
                 default:
-                    OSReport("WRONG SHAPE MATRIX TYPE (__FILE__)\n");
+                    OSReport("WRONG SHAPE MATRIX TYPE (%d)\n", r26->mShapeMtxType);
                     break;
             }
         }

libs/JSystem/src/JFramework/JFWSystem.cpp

@@ -45,7 +45,6 @@ void JFWSystem::firstInit() {
     OSInit();
     DVDInit();
     rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
-    JKRHEAP_NAME(rootHeap, "Root");
     systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false);
     JKRHEAP_NAME(systemHeap, "System");
 }

libs/JSystem/src/JKernel/JKRExpHeap.cpp

@@ -51,6 +51,7 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
 #endif
         heap = JKR_NEW_ARGS (mem1) JKRExpHeap(start1, alignedSize, NULL, errorFlag);
         sRootHeap = heap;
+        JKRHEAP_NAME(sRootHeap, "Root");
     }
     heap->field_0x6e = true;
     return heap;

libs/JSystem/src/JKernel/JKRHeap.cpp

@@ -699,6 +699,14 @@ void JKRHeap::setName(const char* name) {
     strncpy(mName, name, sizeof(mName) - 1);
     mName[sizeof(mName) - 1] = '\0';
 }
+
+void JKRHeap::setNamef(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vsnprintf(mName, sizeof(mName), fmt, args);
+    va_end(args);
+}
+
 const char* JKRHeap::getName() const {
     return mName;
 }