fix functions not returning values (#324)

1 files changed, 47 insertions, 44 deletions

diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
index 37df3184ac..f717c07639 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -163,45 +163,47 @@ s32 J3DModel::entryModelData(J3DModelData* p_modelData, u32 modelFlag, u32 mtxBu
         return 4;
     }
 
-    switch (mMtxBuffer->create(p_modelData, mtxBufferFlag)) {
-    case 0:
-        switch (createShapePacket(p_modelData)) {
-        case 0:
-            switch (createMatPacket(p_modelData, modelFlag)) {
-            case 0:
-                mVertexBuffer.setVertexData(&p_modelData->getVertexData());
-                prepareShapePackets();
-
-                if (modelFlag & J3DMdlFlag_Unk00001) {
-                    onFlag(J3DMdlFlag_Unk00001);
-                }
-                if (modelFlag & J3DMdlFlag_Unk00002) {
-                    onFlag(J3DMdlFlag_Unk00002);
-                }
-                if (modelFlag & J3DMdlFlag_Unk00010) {
-                    onFlag(J3DMdlFlag_Unk00010);
-                }
-                if (modelFlag & J3DMdlFlag_Unk20000) {
-                    onFlag(J3DMdlFlag_Unk20000);
-                }
-                if (modelFlag & J3DMdlFlag_Unk40000) {
-                    onFlag(J3DMdlFlag_Unk40000);
-                }
-                if (modelFlag & J3DMdlFlag_Unk80000) {
-                    onFlag(J3DMdlFlag_Unk80000);
-                }
-                if (modelFlag & J3DMdlFlag_SkinPosCpu) {
-                    onFlag(J3DMdlFlag_SkinPosCpu);
-                }
-                if (modelFlag & J3DMdlFlag_SkinNrmCpu) {
-                    onFlag(J3DMdlFlag_SkinNrmCpu);
-                }
-                return 0;
-            }
-            break;
-        }
-        break;
+    s32 ret = mMtxBuffer->create(p_modelData, mtxBufferFlag);
+    if (ret) {
+        return ret;
+    }
+    ret = createShapePacket(p_modelData);
+    if (ret) {
+        return ret;
+    }
+    ret = createMatPacket(p_modelData, modelFlag);
+    if (ret) {
+        return ret;
+    }
+
+    mVertexBuffer.setVertexData(&p_modelData->getVertexData());
+    prepareShapePackets();
+
+    if (modelFlag & J3DMdlFlag_Unk00001) {
+        onFlag(J3DMdlFlag_Unk00001);
+    }
+    if (modelFlag & J3DMdlFlag_Unk00002) {
+        onFlag(J3DMdlFlag_Unk00002);
+    }
+    if (modelFlag & J3DMdlFlag_Unk00010) {
+        onFlag(J3DMdlFlag_Unk00010);
+    }
+    if (modelFlag & J3DMdlFlag_Unk20000) {
+        onFlag(J3DMdlFlag_Unk20000);
+    }
+    if (modelFlag & J3DMdlFlag_Unk40000) {
+        onFlag(J3DMdlFlag_Unk40000);
     }
+    if (modelFlag & J3DMdlFlag_Unk80000) {
+        onFlag(J3DMdlFlag_Unk80000);
+    }
+    if (modelFlag & J3DMdlFlag_SkinPosCpu) {
+        onFlag(J3DMdlFlag_SkinPosCpu);
+    }
+    if (modelFlag & J3DMdlFlag_SkinNrmCpu) {
+        onFlag(J3DMdlFlag_SkinNrmCpu);
+    }
+    return 0;
 }
 
 /* 80327300-803273CC 321C40 00CC+00 1/1 0/0 0/0 .text createShapePacket__8J3DModelFP12J3DModelData
@@ -437,13 +439,14 @@ s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
         return 0;
     }
 
-    switch (mVertexBuffer.copyLocalVtxArray(param_1)) {
-    case 0:
-        if (param_1 & 4) {
-            p_deformData->offAllFlag(1);
-        }
-        return 0;
+    s32 ret = mVertexBuffer.copyLocalVtxArray(param_1);
+    if (ret) {
+        return ret;
+    }
+    if (param_1 & 4) {
+        p_deformData->offAllFlag(1);
     }
+    return 0;
 }
 
 /* 80327AA0-80327BD4 3223E0 0134+00 0/0 0/0 2/2 .text setSkinDeform__8J3DModelFP13J3DSkinDeformUl