mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 20:59:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

npc_photo OK for JPN

Browse Source
This commit is contained in:
LagoLunatic
2025-08-22 00:57:40 -04:00
parent 88b40eef95
commit b95e8c1ef3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1637,7 +1637,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_p2"),
ActorRel(NonMatching, "d_a_npc_people"), # regalloc
ActorRel(NonMatching, "d_a_npc_pf1"),
ActorRel(MatchingFor("GZLE01", "GZLP01"), "d_a_npc_photo"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_photo"),
ActorRel(NonMatching, "d_a_npc_pm1"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_roten"),
ActorRel(NonMatching, "d_a_npc_rsh1"),
src/d/actor/d_a_npc_photo.cpp
+2 -4
View File
@@ -997,11 +997,9 @@ void daNpcPhoto_c::executeWait() {
eventInfo.setEventId(-1);
field_0x9C7 = true;
dCcD_GObjInf* pGObjInf;
for (int i = 0; i < 2; i++) {
pGObjInf = &field_0x6F8[i];
if (pGObjInf->ChkCoHit()) {
daNpcPhoto_c* pActor = (daNpcPhoto_c*)pGObjInf->GetCoHitAc();
if (field_0x6F8[i].ChkCoHit()) {
daNpcPhoto_c* pActor = (daNpcPhoto_c*)field_0x6F8[i].GetCoHitAc();
if(pActor != NULL && fopAcM_GetProfName(pActor) == PROC_PLAYER) {
field_0x9CD = true;
break;