Skip to content

zNPCMessenger cleanup #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoshSanch merged 1 commit into from
Dec 4, 2025
Merged

zNPCMessenger cleanup #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/SB/Game/zNPCMessenger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,16 @@
static NPCPSData g_postoffice = {};
static S32 g_lockarea;

// see comment in header for why this is declared here
static void NPCPS_copyMsgInfo(NPCMsg*, NPCMsg*, F32);
static void NPCPS_queMessage(NPCMsg* msg);
static S32 NPCPS_flagForMID(en_NPC_MSG_ID);
static void NPCPS_MsgPoolInit(NPCPSData* npc, S32 unk);
static void NPCPS_MsgPoolReset(NPCPSData* npc);
static void NPCPS_CltPoolInit(NPCPSData* npc, S32 unk);
static void NPCPS_CltPoolReset(NPCPSData* npc);
static NPCPSData* NPCPS_postOffice();
static S32 NPCPS_grabMsg();
static void NPCPS_freeMsg(NPCMsg* inmsg);

void zNPCMsg_Startup()
{
Expand Down
14 changes: 0 additions & 14 deletions src/SB/Game/zNPCMessenger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ struct NPCAreaInfo
xVec3 pos_origin;
};



struct NPCMsg
{
en_NPC_MSG_ID msgid;
Expand Down Expand Up @@ -215,13 +213,10 @@ void zNPCMsg_Shutdown();
void zNPCMsg_ScenePrepare();
void zNPCMsg_SceneReset();
void zNPCMsg_Timestep(xScene* xscn, F32 dt);
/* TODO: en_NPC_MSG_ID definition in zNPCTypeCommon.h is causing issues here */
void zNPCMsg_AreaNotify(zNPCCommon* sender, en_NPC_MSG_ID msgid, F32 rad, S32 filter,
en_NPCTYPES toNPCType);
void zNPCMsg_AreaNotify(zNPCCommon* sender, en_NPC_MSG_ID msgid, F32 rad, S32 filter,
en_NPCTYPES* toNPCType);


void zNPCMsg_AreaNotify(zNPCCommon* sender, NPCMsg* msg, F32 radius, S32 filter,
en_NPCTYPES* npcTypeList);
void zNPCMsg_AreaPlayerStun(F32 stuntime, F32 radius, xVec3* pos);
Expand All @@ -230,14 +225,5 @@ void zNPCMsg_SendMsg(en_NPC_MSG_ID msgevent, U32 npc_id);
void zNPCMsg_SendMsg(en_NPC_MSG_ID msgevent, zNPCCommon* npc_sendto);
void zNPCMsg_SendMsg(NPCMsg* inmsg, zNPCCommon* npc_sendto);
void zNPCMsg_SendMsg(NPCMsg* inmsg, F32 delay, zNPCCommon* npc_sendto);
static void NPCPS_copyMsgInfo(NPCMsg*, NPCMsg*, F32);
static void NPCPS_queMessage(NPCMsg* msg);
static void NPCPS_MsgPoolInit(NPCPSData* npc, S32 unk);
static void NPCPS_MsgPoolReset(NPCPSData* npc);
static void NPCPS_CltPoolInit(NPCPSData* npc, S32 unk);
static void NPCPS_CltPoolReset(NPCPSData* npc);
static NPCPSData* NPCPS_postOffice();
static S32 NPCPS_grabMsg();
static void NPCPS_freeMsg(NPCMsg* inmsg);

#endif