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_npc_zrc.cpp
+6 -6
View File
@@ -436,7 +436,7 @@ void daNpc_zrC_c::setParam() {
u32 attn_flags = 10;
selectAction();
if (!mTwilight && daPy_py_c::i_checkNowWolf()) {
if (!mTwilight && daPy_py_c::checkNowWolf()) {
attn_flags = 0;
}
@@ -506,7 +506,7 @@ BOOL daNpc_zrC_c::main() {
0xffff, 0x28, 0xff, 1);
if (mType == 2) {
eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
}
@@ -1169,7 +1169,7 @@ BOOL daNpc_zrC_c::doEvent() {
if (dComIfGp_event_runCheck() != FALSE) {
dEvent_manager_c& event_mgr = dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.i_checkCommandDemoAccrpt()) && !mSpeakEvent)
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mSpeakEvent)
{
mOrderNewEvt = false;
}
@@ -1212,7 +1212,7 @@ BOOL daNpc_zrC_c::doEvent() {
ret = TRUE;
}
if (eventInfo.i_checkCommandDemoAccrpt() && mEventIdx != -1
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1
&& event_mgr.endCheck(mEventIdx)) {
dComIfGp_event_reset();
mOrderEvtNo = EVT_NONE;
@@ -1422,7 +1422,7 @@ BOOL daNpc_zrC_c::waitSick(void* param_0) {
// fallthrough
case 2:
if (daPy_py_c::i_checkNowWolf() && daPy_py_c::checkNowWolfEyeUp()) {
if (daPy_py_c::checkNowWolf() && daPy_py_c::checkNowWolfEyeUp()) {
mCreatureSound.startCreatureVoiceLevel(Z2SE_ZRC_V_SLEEPING, -1);
}
break;
@@ -1454,7 +1454,7 @@ BOOL daNpc_zrC_c::waitPray(void* param_0) {
// fallthrough
case 2:
if (!daNpcF_chkEvtBit(0x1df) && field_0xe30 && !daPy_py_c::i_checkNowWolf()
if (!daNpcF_chkEvtBit(0x1df) && field_0xe30 && !daPy_py_c::checkNowWolf()
&& player_dist <= daNpc_zrC_Param_c::m.field_0x6c
&& !daPy_getPlayerActorClass()->checkPlayerFly()
&& daPy_getPlayerActorClass()->checkSwimUp() && !dComIfGp_checkPlayerStatus0(0, 0x100))