mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -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_ni.cpp
+7 -7
View File
@@ -1510,9 +1510,9 @@ static void play_camera(ni_class* i_this) {
i_this->field_0xa00 = a_this->current.pos.y;
// fallthrough
case 1:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1673,7 +1673,7 @@ static void play_camera(ni_class* i_this) {
sp1D8.y = 0.0f;
sp1D8.z = hREG_F(10) + 50.0f;
MtxPosition(&sp1D8, &sp1E4);
sp214 = cam_line_chk.i_GetCross() - sp1E4;
sp214 = cam_line_chk.GetCross() - sp1E4;
}
if (var_r27 == 0) {
@@ -1808,7 +1808,7 @@ static void action(ni_class* i_this) {
var_r25 = true;
}
if (i_this->field_0xa50 == 1 && daPy_py_c::i_checkNowWolf() &&
if (i_this->field_0xa50 == 1 && daPy_py_c::checkNowWolf() &&
i_this->mDistToPlayer < 300.0f)
{
i_this->mAction = ACTION_MESSAGE_e;
@@ -1993,7 +1993,7 @@ static void action(ni_class* i_this) {
line_chk.Set(&a_this->current.pos, &sp148, a_this);
if (dComIfG_Bgsp().LineCross(&line_chk)) {
sp148.y = line_chk.i_GetCross().y - 10.0f;
sp148.y = line_chk.GetCross().y - 10.0f;
}
gnd_chk_spl.SetPos(&sp148);
@@ -2047,10 +2047,10 @@ static int message(ni_class* i_this) {
OS_REPORT("////////NI MSG FNO %d\n", i_this->mFlowNo);
}
if (i_this->field_0xa50 == 2 && i_this->mFlowNo != -1 && daPy_py_c::i_checkNowWolf()) {
if (i_this->field_0xa50 == 2 && i_this->mFlowNo != -1 && daPy_py_c::checkNowWolf()) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->attention_info.flags, 10);
i_this->eventInfo.i_onCondition(1);
i_this->eventInfo.onCondition(1);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->attention_info.flags, 10);