mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-10 18:46:45 -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_e_s1.cpp
+8 -8
View File
@@ -346,7 +346,7 @@ static void damage_check(e_s1_class* i_this) {
i_this->field_0x6ac = TREG_F(1) + 65.0f;
}
} else {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->mAtInfo.field_0x18 = 36;
} else {
i_this->mAtInfo.field_0x18 = 0;
@@ -365,7 +365,7 @@ static void damage_check(e_s1_class* i_this) {
if (i_this->mAtInfo.mAttackPower < 20) {
i_this->field_0x6ac = TREG_F(0) + 20.0f;
} else if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
} else if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->field_0x6ac = 0.0f;
a_this->health = 0;
@@ -389,7 +389,7 @@ static void damage_check(e_s1_class* i_this) {
}
if (!l_no_fail) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->mAction = ACT_FAIL_WAIT;
i_this->mHitInvincibilityTimer = 10;
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_DEATH, -1);
@@ -1644,9 +1644,9 @@ static void demo_camera(e_s1_class* i_this) {
switch (i_this->mDemoMode) {
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;
}
@@ -1690,9 +1690,9 @@ static void demo_camera(e_s1_class* i_this) {
}
break;
case 10:
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;
}
@@ -1766,7 +1766,7 @@ static void demo_camera(e_s1_class* i_this) {
linchk.Set(&i_this->mDemoCamCenter, &i_this->mDemoCamEye, a_this);
if (dComIfG_Bgsp().LineCross(&linchk)) {
eye = linchk.i_GetCross() + ((center - eye) * 0.1f);
eye = linchk.GetCross() + ((center - eye) * 0.1f);
f32 dist_x = eye.x - center.x;
f32 dist_z = eye.z - center.z;