diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-06 19:30:34 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-06-06 19:30:34 -0400 |
| commit | 90ce6f8ba65b6003f5a8387c8ea1d922ec87aacc (patch) | |
| tree | 806adc87819ed0ddab96222546756f5421b06d5b /src/d/actor | |
| parent | bd5853cb5ae29be5a233b7e571494f5931d0ca25 (diff) | |
PID cleanup
Diffstat (limited to 'src/d/actor')
| -rw-r--r-- | src/d/actor/d_a_auction.cpp | 4 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_eskban.cpp | 3 | ||||
| -rw-r--r-- | src/d/actor/d_a_player_main.cpp | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index f7a9de1f..d3b158a0 100644 --- 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 index e26d0259..a7b66ef9 100644 --- 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 index 7b4bb24e..f0b0e22e 100644 --- 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; } } } |