From f1308361db86f032f2de30ce7a053ffeaf06b042 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 12 Sep 2023 19:23:02 -0700 Subject: [PATCH] f_op_kankyo_mng OK --- configure.py | 2 +- include/d/d_bg_w.h | 1 + include/f_op/f_op_kankyo_mng.h | 4 +--- src/f_op/f_op_kankyo_mng.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 226d88fd9..7f393a445 100644 --- a/configure.py +++ b/configure.py @@ -280,7 +280,7 @@ def ActorRel(status, rel_name): Object(Matching, "f_op/f_op_view.cpp"), Object(Matching, "f_op/f_op_kankyo.cpp"), Object(Matching, "f_op/f_op_msg.cpp"), - Object(NonMatching, "f_op/f_op_kankyo_mng.cpp"), + Object(Matching, "f_op/f_op_kankyo_mng.cpp"), Object(NonMatching, "f_op/f_op_msg_mng.cpp"), Object(Matching, "f_op/f_op_draw_iter.cpp"), Object(Matching, "f_op/f_op_draw_tag.cpp"), diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index d00ee31c9..79df61fed 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -10,6 +10,7 @@ class dBgS_SplGrpChk; class dBgS_SphChk; class cM3dGTri; class dBgS_CrrPos; +class cBgS_PolyInfo; class dBgW; typedef void (*dBgW_CrrFunc)(dBgW*, void*, cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*); diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index d875eb8e8..b9bdb8917 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -12,10 +12,8 @@ struct fopKyM_prm_class { typedef int (*fopKyM_CreateFunc)(void*); -static fopKyM_prm_class* fopKyM_CreateAppend(void); -static fopKyM_prm_class* createAppend(int param_1, cXyz* param_2, cXyz* param_3); void fopKyM_Delete(void* param_1); -static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); +int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, fopKyM_CreateFunc); int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 1ef8dc9d8..c91869174 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -48,7 +48,7 @@ void fopKyM_Delete(void* i_process) { } /* 8002A988-8002A9D8 .text fopKyM_Create__FsPFPv_iPv */ -static int fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { +int fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { return fpcM_Create(i_procName, i_createFunc, i_process); }