diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-03-23 12:55:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 21:55:28 +0200 |
| commit | a4cdad86f4eb28df25708e8b4b1988148f690f2e (patch) | |
| tree | be0399dac50abe47e0d5d718a9fe9bdbffcbf474 /src/d/actor/d_a_do.cpp | |
| parent | 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a (diff) | |
b_gnd equivalent (#2340)
* b_gnd equivalent
* fix dEvt_info_c inlines
* fix some more inlines
Diffstat (limited to 'src/d/actor/d_a_do.cpp')
| -rw-r--r-- | src/d/actor/d_a_do.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 9343458392..7aaad5877f 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -1118,7 +1118,7 @@ static s16 hang_set(do_class* i_this) { vec3[i] += vec2; lin_chk.Set(&vec2, &vec3[i], _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - vec3[i] = lin_chk.i_GetCross(); + vec3[i] = lin_chk.GetCross(); } else { return 0xDCF; } @@ -1760,7 +1760,7 @@ static s8 do_boat(do_class* i_this) { lin_chk.Set(&i_this->field_0xc90, &i_this->field_0xc9c, _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { i_this->field_0xc80 = false; - i_this->mTargetPos = lin_chk.i_GetCross(); + i_this->mTargetPos = lin_chk.GetCross(); i_this->mMode = 5; } } @@ -1883,7 +1883,7 @@ static s8 do_carry(do_class* i_this) { vec.y += 2.0f; lin_chk.Set(&player->eyePos, &vec, _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - _this->current.pos = lin_chk.i_GetCross(); + _this->current.pos = lin_chk.GetCross(); } return ret; @@ -2035,7 +2035,7 @@ static void action(do_class* i_this) { } } - if (i_this->mMessageState == 1 && daPy_py_c::i_checkNowWolf() + if (i_this->mMessageState == 1 && daPy_py_c::checkNowWolf() && i_this->mDistFromPlayer < 300.0f) { i_this->mAction = ACT_MESSAGE; @@ -2328,10 +2328,10 @@ static void message(do_class* i_this) { i_this->mIsTalking = 1; } - if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::i_checkNowWolf()) { + if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::checkNowWolf()) { fopAcM_OnStatus(i_this, 0); cLib_onBit<u32>(i_this->attention_info.flags, 0xa); - i_this->eventInfo.i_onCondition(dEvtCnd_CANTALK_e); + i_this->eventInfo.onCondition(dEvtCnd_CANTALK_e); } else { fopAcM_OffStatus(i_this, 0); cLib_offBit<u32>(i_this->attention_info.flags, 0xa); |
