falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_blue_ns OK (#2924) 

* Match daNpcBlueNS_c::_Execute

* Cleanup loop

* d_a_npc_blue_ns OK
This commit is contained in:
LagoLunatic 2025-12-07 14:26:55 -05:00 committed by GitHub
parent cd94afafa0
commit 40a8b9ed54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1966,7 +1966,7 @@ config.libs = [
ActorRel(Equivalent, "d_a_npc_ash"), # weak func order (sinShort)
ActorRel(Equivalent, "d_a_npc_ashB"), # weak func order (sinShort)
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_bans"),
ActorRel(NonMatching, "d_a_npc_blue_ns"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_blue_ns"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_bou"),
ActorRel(Equivalent, "d_a_npc_bouS"), # weak func order (sinShort)
ActorRel(Equivalent, "d_a_npc_cdn3"), # weak func order (~csXyz); vtable order

2
include/d/actor/d_a_npc_blue_ns.h
View File

@ -24,7 +24,7 @@ public:
int isDelete();
int Delete();
int Execute();
int _Execute();
void _Execute();
void callEvt_changeYami();
fpc_ProcID create_Yamijin(int);
BOOL col_check();

8
src/d/actor/d_a_npc_blue_ns.cpp
View File

@ -216,8 +216,7 @@ int daNpcBlueNS_c::Execute() {
return 1;
}
// NONMATCHING - small regalloc
int daNpcBlueNS_c::_Execute() {
void daNpcBlueNS_c::_Execute() {
setParam();
if (main()) {
@ -255,7 +254,10 @@ int daNpcBlueNS_c::_Execute() {
field_0x9f3 = 0;
for (int i = 0; i < 5; i++) {
if ((mAttnChangeTimer == 0 || mAttnIdx != i) && mAttnActorTimer[i] != 0 && cLib_calcTimer<int>(&mAttnActorTimer[i]) == 0) {
if (mAttnChangeTimer != 0 && mAttnIdx == i) {
continue;
}
if (mAttnActorTimer[i] != 0 && cLib_calcTimer<int>(&mAttnActorTimer[i]) == 0) {
mAttnActor[i].remove();
}
}