mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-28 07:08:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process IDs cleanup

Browse Source 
* Use fpcM_ERROR_PROCESS_ID_e enum instead of literal -1/0xFFFFFFFF everywhere
* Disambiguate variable names by using itemNo/msgNo instead of itemID/msgID
This commit is contained in:
LagoLunatic
2023-11-22 16:25:28 -05:00
parent 906c8a8314
commit 469f243030
28 changed files with 132 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_npc.cpp
+6 -6
View File
@@ -651,26 +651,26 @@ void fopNpc_npc_c::setCollision(f32 radius, f32 height) {
u16 fopNpc_npc_c::talk(int param_1) {
u16 mode = 0xFF;
if(mCurrMsgBsPcId == 0xFFFFFFFF) {
if(mCurrMsgBsPcId == fpcM_ERROR_PROCESS_ID_e) {
if(param_1 == 1) {
mCurrMsgID = getMsg();
mCurrMsgNo = getMsg();
}
mCurrMsgBsPcId = fopMsgM_messageSet(mCurrMsgID, this);
mCurrMsgBsPcId = fopMsgM_messageSet(mCurrMsgNo, this);
mpCurrMsg = 0;
}
else {
if(mpCurrMsg) {
mode = mpCurrMsg->mMode;
if(mode == dNpcMsgStts_MSG_DISPLAYED_e) {
mpCurrMsg->mMode = next_msgStatus(&mCurrMsgID);
mpCurrMsg->mMode = next_msgStatus(&mCurrMsgNo);
if(mpCurrMsg->mMode == dNpcMsgStts_MSG_CONTINUES_e) {
fopMsgM_messageSet(mCurrMsgID);
fopMsgM_messageSet(mCurrMsgNo);
}
}
else if (mode == dNpcMsgStts_BOX_CLOSED_e) {
mpCurrMsg->mMode = dNpcMsgStts_MSG_DESTROYED_e;
mCurrMsgBsPcId = -1;
mCurrMsgBsPcId = fpcM_ERROR_PROCESS_ID_e;
}
anmAtr(mode);