msg inline fixes, remove some fake jsystem inlines

4 files changed, 13 insertions, 12 deletions

diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index 81a93622..027ab190 100644
--- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -205,7 +205,7 @@ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* dst) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     return mAnm;
 }
@@ -250,7 +250,7 @@ void J3DAnmFullLoader_v15::setResource(J3DAnmBase* dst, const void* data) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
 }
 
@@ -397,7 +397,7 @@ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* dst) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     return mAnm;
 }
@@ -442,7 +442,7 @@ void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* dst, const void* data) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
 }
 
diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index 11c7002e..e4b307c2 100644
--- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -45,7 +45,7 @@ void* J3DClusterLoader_v15::load(const void* i_data) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
 
     return mpDeformData;
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index f79c93b7..6fabb49d 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -104,7 +104,7 @@ J3DModelData* J3DModelLoader::load(const void* i_data, u32 i_flags) {
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     const J3DModelHierarchy* hierarchy = mpModelData->getHierarchy();
     mpModelData->makeHierarchy(NULL, &hierarchy);
@@ -139,7 +139,7 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(const void* i_data) {
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     if (mpMaterialTable->getTexture() == NULL) {
         mpMaterialTable->setTexture(new J3DTexture(0, NULL));
@@ -199,7 +199,7 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(const void* i_data, u32 i_fl
                 OSReport("Unknown data block\n");
                 break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     J3DModelHierarchy const* hierarchy = mpModelData->getHierarchy();
     mpModelData->makeHierarchy(NULL, &hierarchy);
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
index 09f022a2..4f4c5b93 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
@@ -17,10 +17,11 @@
 u16 J3DModelLoader::countMaterialNum(const void* i_data) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
-    for (int i = 0; i < header->mBlockNum; block = block->getNext(), i++) {
+    for (int i = 0; i < header->mBlockNum; i++) {
         if (block->mType == 'MAT3') {
             return ((const J3DMaterialBlock*)block)->mMaterialNum;
         }
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     return 0;
 }
@@ -63,7 +64,7 @@ u32 J3DModelLoader::calcLoadSize(const void* i_data, u32 i_flags) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     return size;
 }
@@ -91,7 +92,7 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* i_data) {
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
 
     if (!hasTextureTable) {
@@ -150,7 +151,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flag
             OSReport("Unknown data block\n");
             break;
         }
-        block = block->getNext();
+        block = (JUTDataBlockHeader*)((u8*)block + block->mSize);
     }
     return size;
 }