more misc. cleanup (#2232)

1 files changed, 8 insertions, 17 deletions

diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp
index 9434574dc7..95953478e8 100644
--- a/src/d/actor/d_a_door_shutter.cpp
+++ b/src/d/actor/d_a_door_shutter.cpp
@@ -279,8 +279,7 @@ void daDoor20_c::setEventPrm() {
             }
             if (chkMakeKey()) {
                 if (field_0x5f0) {
-                    // FAKE MATCH: should be daPy_py_c::i_checkNowWolf
-                    if (((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf()) {
+                    if (daPy_py_c::i_checkNowWolf()) {
                         if (dComIfGs_getKeyNum() == 0) {
                             return;
                         }
@@ -446,13 +445,11 @@ void daDoor20_c::openInit_0() {
         csXyz acStack_2c(0, field_0x670, 0);
         for (u32 i = 0; i < 5; i++) {
             if (strcmp(dComIfGp_getStartStageName(), "D_MN10") == 0) {
-                s32 roomNo = fopAcM_GetRoomNo(this);
-                dComIfGp_particle_set(l_eff_id_lv4[i],
-                    &current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
+                dComIfGp_particle_set(l_eff_id_lv4[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
+                                      fopAcM_GetRoomNo(this), NULL, NULL, NULL);
             } else {
-                s32 roomNo = fopAcM_GetRoomNo(this);
-                dComIfGp_particle_set(l_eff_id_lv3[i],
-                    &current.pos, &acStack_2c, NULL, 0xff, NULL, roomNo, NULL, NULL, NULL);
+                dComIfGp_particle_set(l_eff_id_lv3[i], &current.pos, &acStack_2c, NULL, 0xff, NULL,
+                                      fopAcM_GetRoomNo(this), NULL, NULL, NULL);
             }
         }
         fopAcM_onSwitch(this, bVar5);
@@ -462,12 +459,6 @@ void daDoor20_c::openInit_0() {
     }
 }
 
-/* 80466864-80466868 000044 0004+00 1/1 0/0 0/0 .rodata          l_eff_id$4449 */
-static u16 const l_eff_id[2] = {
-    0x8295,
-    0x8296,
-};
-
 /* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text            openInit_1__10daDoor20_cFv */
 void daDoor20_c::openInit_1() {
     J3DAnmTransform* anm;
@@ -481,10 +472,10 @@ void daDoor20_c::openInit_1() {
     JUT_ASSERT(918, rt == 0);
     u8 bVar5 = door_param2_c::getSwbit3(this);
     if (bVar5 != 0xff && !fopAcM_isSwitch(this, bVar5)) {
+        static u16 const l_eff_id[2] = {0x8295, 0x8296};
         for (int i = 0; i < 2; i++) {
-            s32 roomNo = fopAcM_GetRoomNo(this);
             dComIfGp_particle_set(l_eff_id[i], &current.pos, &shape_angle, NULL, 0xff, NULL,
-                                  roomNo, NULL, NULL, NULL);
+                                  fopAcM_GetRoomNo(this), NULL, NULL, NULL);
         }
         fopAcM_onSwitch(this, bVar5);
         field_0x672 = true;
@@ -2289,4 +2280,4 @@ extern actor_process_profile_definition g_profile_DOOR20 = {
     0x44000,                // mStatus
     fopAc_ACTOR_e,          // mActorType
     fopAc_CULLBOX_CUSTOM_e, // cullType
-};
\ No newline at end of file
+};