mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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_uri.cpp
+5 -4
View File
@@ -8,6 +8,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_npc_uri.h"
#include "m_Do/m_Do_graphic.h"
#include <cstring>
const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = {
200.0f, // attention_offset
@@ -903,12 +904,12 @@ int daNpc_Uri_c::selectAction() {
switch (mType) {
case TYPE_1:
if (field_0x100d != NULL) {
if (field_0x100d != 0) {
field_0xfc0[0] = &daNpc_Uri_c::sitWait;
} else {
if (field_0x100e != NULL) {
if (field_0x100e != 0) {
/* T_0007 - Ordon Village - During Uli's pick-up tutorial */
if (daNpcT_chkTmpBit(7) && field_0x100f == NULL) {
if (daNpcT_chkTmpBit(7) && field_0x100f == 0) {
field_0xfc0[0] = &daNpc_Uri_c::walk;
} else {
field_0xfc0[0] = &daNpc_Uri_c::wait;
@@ -980,7 +981,7 @@ int daNpc_Uri_c::getTutorialCond(cXyz param_1) {
field_0x1000 = mpHIO->m.field_0xa8 - 100.0f;
return 5;
}
if (field_0x1009 != NULL) {
if (field_0x1009 != 0) {
return 8;
}
}