diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-12-24 11:10:29 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-12-24 11:10:29 -0800 |
| commit | 5db3dff2fc419a28af2eda66f401e962f7daf892 (patch) | |
| tree | 73d32bf4a0f7d6ae38770275da8fad83acb417a9 | |
| parent | df1da24f1b93370ecfa2f6476c2c7cba47c1c967 (diff) | |
J3DJointFactory match
| -rw-r--r-- | configure.py | 2 | ||||
| -rw-r--r-- | src/JSystem/J3DGraphLoader/J3DJointFactory.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 031c0e3e..22484420 100644 --- a/configure.py +++ b/configure.py @@ -891,7 +891,7 @@ config.libs = [ Object(NonMatching, "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"), Object(Matching, "JSystem/J3DGraphLoader/J3DModelLoader.cpp"), Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), - Object(NonMatching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), + Object(Matching, "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), Object(NonMatching, "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), Object(NonMatching, "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"), ], diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp index df4b9a4e..ee2acea7 100644 --- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp @@ -9,9 +9,8 @@ /* 802FE1A4-802FE1FC .text __ct__15J3DJointFactoryFRC13J3DJointBlock */ J3DJointFactory::J3DJointFactory(const J3DJointBlock& jointBlock) { - /* Nonmatching */ - mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&jointBlock, jointBlock.mpJointInitData); - mIndexTable = JSUConvertOffsetToPtr<u16>(&jointBlock, jointBlock.mpIndexTable); + mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&jointBlock, (u32)jointBlock.mpJointInitData); + mIndexTable = JSUConvertOffsetToPtr<u16>(&jointBlock, (u32)jointBlock.mpIndexTable); } /* 802FE1FC-802FE390 .text create__15J3DJointFactoryFi */ |