From 05098b420721d2102ee72cf0a9c8cb15c1b42deb Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 25 Nov 2023 13:59:46 -0500 Subject: [PATCH] obj_gong match --- configure.py | 2 +- src/d/actor/d_a_obj_gong.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index 1e383b958..2b3798ab0 100644 --- a/configure.py +++ b/configure.py @@ -1529,7 +1529,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_gnnbtltaki"), ActorRel(NonMatching, "d_a_obj_gnndemotakie"), ActorRel(NonMatching, "d_a_obj_gnndemotakis"), - ActorRel(NonMatching, "d_a_obj_gong"), + ActorRel(Matching, "d_a_obj_gong"), ActorRel(NonMatching, "d_a_obj_gtaki"), ActorRel(NonMatching, "d_a_obj_hami2"), ActorRel(NonMatching, "d_a_obj_hami3"), diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index cf8872290..f79d57910 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -114,9 +114,8 @@ bool daObjGong::Act_c::_execute() { /* 000004F0-00000580 .text _draw__Q29daObjGong5Act_cFv */ bool daObjGong::Act_c::_draw() { - /* Nonmatching - just some tiny regalloc */ - J3DModel* model = mpMorf->getModel(); - J3DModelData* modelData = model->getModelData(); + J3DModel* model = (J3DModel*)mpMorf->getModel(); + J3DModelData* modelData = (J3DModelData*)model->getModelData(); g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &mTevStr); g_env_light.setLightTevColorType(model, &mTevStr); dDlst_texSpecmapST(&mEyePos, &mTevStr, modelData, attr().spec); @@ -163,7 +162,7 @@ namespace daObjGong { actor_process_profile_definition g_profile_Obj_Gong = { /* LayerID */ fpcLy_CURRENT_e, - /* ListID */ 3, + /* ListID */ 7, /* ListPrio */ fpcPi_CURRENT_e, /* ProcName */ PROC_Obj_Gong, /* Proc SubMtd */ &g_fpcLf_Method.mBase, @@ -171,7 +170,7 @@ actor_process_profile_definition g_profile_Obj_Gong = { /* SizeOther */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopAc_Method.base, - /* Priority */ 0x004C, + /* Priority */ 0x0081, /* Actor SubMtd */ &daObjGong::Mthd_Table, /* Status */ fopAcStts_UNK40000_e | fopAcStts_CULL_e | fopAcStts_NOCULLEXEC_e, /* Group */ fopAc_ACTOR_e,