d_a_e_zm matching (#2638)

* initial work

* a little more work

* matching

* pr cleanup

* changed 'subtype' to 'argument'

* fixed debug error

2 files changed, 4 insertions, 4 deletions

diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index 1ff1a7f736..55dd164e09 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -153,7 +153,7 @@ static int fopAc_Create(void* i_this) {
             a_this->home.angle = append->base.angle;
             a_this->shape_angle = append->base.angle;
             a_this->parentActorID = append->parent_id;
-            a_this->subtype = append->subtype;
+            a_this->argument = append->subtype;
             a_this->scale.set(append->scale.x * 0.1f, append->scale.y * 0.1f,
                               append->scale.z * 0.1f);
             a_this->setID = append->base.setID;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index bac05b025a..58dcc20b5c 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -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;
         }