mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-19 22:02:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_e_zm matching (#2638)

Browse Source 
* initial work

* a little more work

* matching

* pr cleanup

* changed 'subtype' to 'argument'

* fixed debug error
This commit is contained in:
Carco_21
2025-09-09 15:53:13 -07:00
committed by GitHub
parent 1e50c25671
commit bfeb1c048b
24 changed files with 1124 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_actor_mng.cpp
+3 -3
View File
@@ -1911,7 +1911,7 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat
/* 8001D5A4-8001D5EC 017EE4 0048+00 1/1 0/0 0/0 .text fopAcM_getProcNameString__FPC10fopAc_ac_c */
static const char* fopAcM_getProcNameString(const fopAc_ac_c* i_actor) {
const char* name = dStage_getName2(i_actor->base.profname, i_actor->subtype);
const char* name = dStage_getName2(i_actor->base.profname, i_actor->argument);
return name != NULL ? name : "UNKOWN";
}
@@ -1923,7 +1923,7 @@ static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_
return NULL;
}
if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->subtype) {
if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->argument) {
if (prm->prm0 == 0 || prm->prm1 == (prm->prm0 & fopAcM_GetParam(i_actor))) {
return i_actor;
}
@@ -1957,7 +1957,7 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) {
return NULL;
}
if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->subtype) {
if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->argument) {
if (prm->event_id < 0 || prm->event_id == i_actor->eventInfo.getIdx()) {
return i_actor;
}