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_fairy.cpp
+4 -3
View File
@@ -9,6 +9,7 @@
#include "d/actor/d_a_npc4.h"
#include "d/d_s_play.h"
#include "JSystem/JHostIO/JORFile.h"
#include <cstring>
enum fairy_RES_File_ID {
/* BCK */
@@ -882,7 +883,7 @@ void daNpc_Fairy_c::srchActors() {
BOOL daNpc_Fairy_c::evtTalk() {
if (chkAction(&daNpc_Fairy_c::talk)) {
(this->*mAction)(NULL);
(this->*mAction)(0);
} else {
mPreItemNo = 0;
@@ -951,7 +952,7 @@ void daNpc_Fairy_c::action() {
}
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
}
@@ -1123,7 +1124,7 @@ BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) {
mMode = 0xFFFF;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mMode = 0;