Merge branch 'main' into 26-02-27-allocator-isolation

src/d/actor/d_a_npc_shad.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_npc.h"
 #include "d/actor/d_a_tag_evtarea.h"
 #include "d/d_msg_object.h"
+#include <cstring>
 
 const daNpcShad_HIOParam daNpcShad_Param_c::m = {
     35.0f,      // attention_offset 
@@ -1484,7 +1485,7 @@ bool daNpcShad_c::talk(void* param_1) {
             if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
                 if (talkProc(NULL, TRUE, NULL)) {
                     mActorMngr[0].entry(daPy_getPlayerActorClass());
-                    itemNo = NULL;
+                    itemNo = 0;
                     eventID = mFlow.getEventId(&itemNo);
                     OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo); // At the end of the conversation, Event ID=%d Item No=%d