PID cleanup

zeldaret · Jun 6, 2024 · 90ce6f8 · 90ce6f8
1 parent bd5853c
commit 90ce6f8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h
@@ -95,7 +95,7 @@ class daAuction_c : public fopNpc_npc_c {
 public:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ dNpc_EventCut_c mNpcEvtInfo;
-    /* 0x738 */ u32 m738[8];
+    /* 0x738 */ uint m738[8];
     /* 0x758 */ uint mCurrAuctionItemPID;
     /* 0x75C */ uint mTimerID;
     /* 0x760 */ uint mGaugeID;

diff --git a/include/d/actor/d_a_obj_eskban.h b/include/d/actor/d_a_obj_eskban.h
@@ -60,7 +60,7 @@ namespace daObjEskban {
         /* 0x320 */ dCcD_Cyl mCheckCyl;
         /* 0x450 */ dCcD_Stts mCameraStts;
         /* 0x48C */ dCcD_Cyl mCameraCyl;
-        /* 0x5BC */ u32 mActorID;
+        /* 0x5BC */ uint mActorID;
         /* 0x5C0 */ dCcD_Stts mCheckSphStts;
         /* 0x5FC */ dCcD_Sph mCheckSph;
         /* 0x728 */ s32 mActorState;

diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
@@ -2104,7 +2104,7 @@ class daPy_lk_c : public daPy_py_c {
     /* 0x3624 */ u32 m3624;
     /* 0x3628 */ int m3628;
     /* 0x362C */ uint mTactZevPartnerPID;
-    /* 0x3630 */ u32 m3630;
+    /* 0x3630 */ uint m3630;
     /* 0x3634 */ int m3634;
     /* 0x3638 */ int mMsgId;
     /* 0x363C */ J3DFrameCtrl* mpSeAnmFrameCtrl;

diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h
@@ -98,7 +98,7 @@ class daTbox_c : public fopAc_ac_c {
     /* 0x328 */ mDoExt_brkAnm mTactPlatformBrk;
     /* 0x340 */ ActionFunc mActionFunc;
     /* 0x34C */ f32 mInvisibleScrollVal;
-    /* 0x350 */ u32 mStaffId;
+    /* 0x350 */ int mStaffId;
     /* 0x354 */ Mtx mMtx;
     /* 0x384 */ LIGHT_INFLUENCE mPLight;
     /* 0x3A4 */ LIGHT_INFLUENCE mEfLight;

diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
@@ -212,7 +212,7 @@ extern uint dAuction_screen_create();
 /* 000000EC-000002FC       .text __ct__11daAuction_cFv */
 daAuction_c::daAuction_c() {
     for (int i = 0; i < 8; i++) {
-        m738[i] = -1;
+        m738[i] = fpcM_ERROR_PROCESS_ID_e;
         m80C[i] = i;
         mAucMdlNo[i] = 0xFF;
     }
@@ -373,7 +373,7 @@ BOOL daAuction_c::_execute() {
 /* 00000B10-00000B44       .text executeWait__11daAuction_cFv */
 void daAuction_c::executeWait() {
     for (int i = 0; i < 8; i++) {
-        if (m738[i] == -1) {
+        if (m738[i] == fpcM_ERROR_PROCESS_ID_e) {
             return;
         }
     }

diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp
@@ -298,7 +298,8 @@ int daObjEskban::Act_c::Execute(Mtx** pMtx) {
             break;
         }
         cCcD_Obj* hitObj;
-        if (!(hitObj = mCameraCyl.GetCoHitObj())) {
+        hitObj = mCameraCyl.GetCoHitObj();
+        if (!hitObj) {
             break;
         }
         fopAc_ac_c* hitAct = hitObj->GetAc();

diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
@@ -1130,7 +1130,7 @@ void daPy_lk_c::setActorPointer() {
     if (m3630 != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* sp8;
         if (!fopAcM_SearchByID(m3630, &sp8)) {
-            m3630 = -1;
+            m3630 = fpcM_ERROR_PROCESS_ID_e;
         }
     }
 }