mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_hanjo.cpp
+3 -2
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_tag_evtarea.h"
#include "d/d_cc_uty.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static int l_bmdData[4][2] = {
{14, 1}, {26, 2},
@@ -198,7 +199,7 @@ int daNpc_Hanjo_c::create() {
mTwilight = 0;
int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType,
OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (u32)mType,
mFlowNodeNo, getPathID(), fopAcM_GetParam(this));
if (isDelete()) {
OS_REPORT("===>isDelete:TRUE\n");
@@ -1790,7 +1791,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
}
}
}
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != NULL) {
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != 0) {
if (!daPy_getPlayerActorClass()->checkPlayerFly() ||
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())