From 9b6f6484c4e876465df1a92615ad45c59abe67b7 Mon Sep 17 00:00:00 2001
From: Franklyn Tackitt <git@frank.af>
Date: Mon, 26 Feb 2024 06:39:38 -0700
Subject: [PATCH] PR cleanup

---
 include/d/actor/d_a_obj_vfan.h |  4 ++--
 src/d/actor/d_a_obj_vfan.cpp   | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/d/actor/d_a_obj_vfan.h b/include/d/actor/d_a_obj_vfan.h
index 1dd57b104..4dc060bd2 100644
--- a/include/d/actor/d_a_obj_vfan.h
+++ b/include/d/actor/d_a_obj_vfan.h
@@ -25,7 +25,7 @@ public:
 
     int CreateHeap();
     int Create();
-    cPhs__Step Mthd_Create();
+    s32 Mthd_Create();
     BOOL Delete();
     BOOL Mthd_Delete();
     void set_mtx();
@@ -39,7 +39,7 @@ public:
     /* 0x2D0 */ J3DModel* mpModel;
     /* 0x2D4 */ dCcD_Stts mStts;
     /* 0x310 */ dCcD_Cyl mCyl;
-    /* 0x440 */ int mSwitchNo;
+    /* 0x440 */ int mState;
     /* 0x444 */ bool mIsAlive;
     /* 0x448 */ int mBreakTimer;
 };
diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp
index a873e3c29..3268c8db6 100644
--- a/src/d/actor/d_a_obj_vfan.cpp
+++ b/src/d/actor/d_a_obj_vfan.cpp
@@ -20,7 +20,7 @@ static dCcD_SrcCyl cyl_check_src = {{
                                         /* SrcObjAt  Type    */ 0,
                                         /* SrcObjAt  Atp     */ 0,
                                         /* SrcObjAt  SPrm    */ 0,
-                                        /* SrcObjTg  Type    */ 1 << 29,
+                                        /* SrcObjTg  Type    */ AT_TYPE_PGANON_SWORD,
                                         /* SrcObjTg  SPrm    */ 9,
                                         /* SrcObjCo  SPrm    */ 0,
                                         /* SrcGObjAt Se      */ 0,
@@ -73,7 +73,7 @@ int daObjVfan::Act_c::Create() {
 
     mIsAlive = true;
     mBreakTimer = 0;
-    mSwitchNo = 0;
+    mState = 0;
 
     m_evid = dComIfGp_evmng_getEventIdx("Vfan", 0xff);
 
@@ -81,7 +81,7 @@ int daObjVfan::Act_c::Create() {
 }
 
 /* 00000214-000003D0       .text Mthd_Create__Q29daObjVfan5Act_cFv */
-cPhs__Step daObjVfan::Act_c::Mthd_Create() {
+s32 daObjVfan::Act_c::Mthd_Create() {
     fopAcM_SetupActor(this, daObjVfan::Act_c);
 
     cPhs__Step phase_state;
@@ -134,7 +134,6 @@ void daObjVfan::Act_c::init_mtx() {
 
 /* 000006BC-000009B4       .text ParticleSet__Q29daObjVfan5Act_cFv */
 void daObjVfan::Act_c::ParticleSet() {
-    // was this manually unrolled?
     dComIfGp_particle_set(0x83cd, &current.pos, &current.angle);
     dComIfGp_particle_set(0x83ce, &current.pos, &current.angle);
     dComIfGp_particle_set(0x83cf, &current.pos, &current.angle);
@@ -150,7 +149,7 @@ void daObjVfan::Act_c::ParticleSet() {
 
 /* 000009B4-00000C74       .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */
 int daObjVfan::Act_c::Execute(Mtx** mtx) {
-    switch (mSwitchNo) {
+    switch (mState) {
     case 0:
         dComIfG_Ccsp()->Set(&mCyl);
         if (mCyl.ChkTgHit()) {
@@ -160,7 +159,7 @@ int daObjVfan::Act_c::Execute(Mtx** mtx) {
                 }
             }
             fopAcM_orderOtherEventId(this, m_evid);
-            mSwitchNo = 1;
+            mState = 1;
         }
 
         break;
@@ -172,7 +171,7 @@ int daObjVfan::Act_c::Execute(Mtx** mtx) {
 
             ParticleSet();
             mBreakTimer = 0;
-            mSwitchNo = 2;
+            mState = 2;
         } else {
             fopAcM_orderOtherEventId(this, m_evid);
         }
@@ -185,7 +184,7 @@ int daObjVfan::Act_c::Execute(Mtx** mtx) {
             fopAcM_seStartCurrent(this, JA_SE_OBJ_GN_SW_DR_BREAK, 0);
         }
 
-        mBreakTimer += 1;
+        mBreakTimer++;
 
         if (dComIfGp_evmng_endCheck(m_evid)) {
             fopAcM_onSwitch(this, prm_get_swSave());