From 9c014e2daa3f3cf98ce72d09599e2cae560aeacd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 19 Nov 2022 11:54:26 +1000 Subject: [PATCH] Fix arguments for model00018680 --- src/include/lib/model.h | 2 +- src/lib/model.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/lib/model.h b/src/include/lib/model.h index 5027ef426..cf9b7bcce 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -8,7 +8,7 @@ extern bool (*var8005efc4)(struct model *model, struct modelnode *node); extern struct gfxvtx *(*g_ModelVtxAllocatorFunc)(s32 numvertices); extern void (*g_ModelJointPositionedFunc)(s32 mtxindex, Mtxf *mtx); -bool model00018680(void); +bool model00018680(struct modelrenderdata *renderdata, struct model *model); void modelSetDistanceScale(f32 value); void modelSetVtxAllocatorFunc(struct gfxvtx *(*fn)(s32 numvertices)); s32 model0001a524(struct modelnode *node, s32 arg1); diff --git a/src/lib/model.c b/src/lib/model.c index cf1b06092..b3184266b 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -1469,19 +1469,19 @@ void model0001cd18(struct modelrenderdata *arg0, struct model *model) } } -void model0001ce64(struct modelrenderdata *arg0, struct model *model) +void model0001ce64(struct modelrenderdata *renderdata, struct model *model) { - model->matrices = arg0->unk10; + model->matrices = renderdata->unk10; - arg0->unk10 += model->filedata->nummatrices; + renderdata->unk10 += model->filedata->nummatrices; #if VERSION >= VERSION_PAL_BETA - if (var8005efb0_2 || !model00018680()) { - model0001cd18(arg0, model); + if (var8005efb0_2 || !model00018680(renderdata, model)) { + model0001cd18(renderdata, model); } #else - if (!model00018680()) { - model0001cd18(arg0, model); + if (!model00018680(renderdata, model)) { + model0001cd18(renderdata, model); } #endif }