mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-18 07:25:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 12:55:28 -07:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_do.cpp
+6 -6
View File
@@ -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);