From b95e8c1ef328a444d12c3b41ec28fc0dff4b7ac5 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 22 Aug 2025 00:57:40 -0400 Subject: [PATCH] npc_photo OK for JPN --- configure.py | 2 +- src/d/actor/d_a_npc_photo.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index 72e95a44d..57428cba8 100755 --- a/configure.py +++ b/configure.py @@ -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"), diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 27c329473..5bcbe91c2 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -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;