diff options
Diffstat (limited to 'src/d/d_msg_object.cpp')
| -rw-r--r-- | src/d/d_msg_object.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index aa2a6957aa..0cb515113c 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -39,7 +39,7 @@ s16 dMsgObject_getGroupID() { static int dMsgObject_searchSSItem(void* param_1, void* param_2) { daPy_py_c* player = daPy_getPlayerActorClass(); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SSITEM) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SSITEM_e) { if (static_cast<daObj_SSBase_c*>(param_1)->getProcessID() == player->getGrabActorID()) { static_cast<daObj_SSBase_c*>(param_1)->setSoldOut(); return 0; @@ -2130,7 +2130,7 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) { u16 dMsgObject_c::getSmellTypeMessageIDLocal() { u16 msgId = 0; int smell = dComIfGs_getCollectSmell(); - if (smell < fpcNm_ITEM_SMELL_MEDICINE + 1 && smell >= fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (smell < dItemNo_SMELL_MEDICINE_e + 1 && smell >= dItemNo_SMELL_YELIA_POUCH_e) { msgId = smell + 0x165; } else { if (dComIfGs_getCollectSmell() != -1) { @@ -2463,15 +2463,15 @@ static leafdraw_method_class l_dMsgObject_Method = { }; msg_process_profile_definition g_profile_MSG_OBJECT = { - fpcLy_CURRENT_e, // mLayerID - 12, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MSG_OBJECT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dMsgObject_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopMsg_Method, // sub_method - 770, // mPriority - &l_dMsgObject_Method, // sub_method + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MSG_OBJECT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMsgObject_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_MSG_OBJECT_e, + /* Msg SubMtd */ &l_dMsgObject_Method, }; |