From 0a86117a3b827a40c2065311ab5d8eedb079fe8e Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 15 Jul 2025 15:03:01 -0400 Subject: [PATCH] Create return type cleanup, use dist enum --- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_auction.cpp | 2 +- src/d/actor/d_a_beam.cpp | 2 +- src/d/actor/d_a_bst.cpp | 4 ++-- src/d/actor/d_a_canon.cpp | 2 +- src/d/actor/d_a_daiocta.cpp | 2 +- src/d/actor/d_a_daiocta_eye.cpp | 2 +- src/d/actor/d_a_fm.cpp | 2 +- src/d/actor/d_a_goal_flag.cpp | 2 +- src/d/actor/d_a_gy.cpp | 2 +- src/d/actor/d_a_gy_ctrl.cpp | 2 +- src/d/actor/d_a_hot_floor.cpp | 2 +- src/d/actor/d_a_kaji.cpp | 2 +- src/d/actor/d_a_kmon.cpp | 2 +- src/d/actor/d_a_npc_ah.cpp | 2 +- src/d/actor/d_a_npc_auction.cpp | 2 +- src/d/actor/d_a_npc_bmcon1.cpp | 2 +- src/d/actor/d_a_npc_btsw.cpp | 4 ++-- src/d/actor/d_a_npc_ji1.cpp | 4 ++-- src/d/actor/d_a_npc_kg1.cpp | 2 +- src/d/actor/d_a_npc_km1.cpp | 4 ++-- src/d/actor/d_a_npc_mn.cpp | 2 +- src/d/actor/d_a_npc_mt.cpp | 2 +- src/d/actor/d_a_npc_nz.cpp | 2 +- src/d/actor/d_a_npc_p2.cpp | 2 +- src/d/actor/d_a_npc_people.cpp | 2 +- src/d/actor/d_a_npc_photo.cpp | 2 +- src/d/actor/d_a_npc_roten.cpp | 2 +- src/d/actor/d_a_npc_so.cpp | 2 +- src/d/actor/d_a_npc_sv.cpp | 2 +- src/d/actor/d_a_obj_balancelift.cpp | 2 +- src/d/actor/d_a_obj_bemos.cpp | 2 +- src/d/actor/d_a_obj_bscurtain.cpp | 2 +- src/d/actor/d_a_obj_canon.cpp | 2 +- src/d/actor/d_a_obj_demo_barrel.cpp | 2 +- src/d/actor/d_a_obj_figure.cpp | 2 +- src/d/actor/d_a_obj_hat.cpp | 2 +- src/d/actor/d_a_obj_hole.cpp | 2 +- src/d/actor/d_a_obj_ikada.cpp | 2 +- src/d/actor/d_a_obj_kanoke.cpp | 2 +- src/d/actor/d_a_obj_lpalm.cpp | 2 +- src/d/actor/d_a_obj_majyuu_door.cpp | 2 +- src/d/actor/d_a_obj_quake.cpp | 2 +- src/d/actor/d_a_obj_roten.cpp | 2 +- src/d/actor/d_a_obj_stair.cpp | 2 +- src/d/actor/d_a_obj_tousekiki.cpp | 2 +- src/d/actor/d_a_obj_warpt.cpp | 2 +- src/d/actor/d_a_rd.cpp | 2 +- src/d/actor/d_a_salvage.cpp | 2 +- src/d/actor/d_a_sie_flag.cpp | 2 +- src/d/actor/d_a_tag_ghostship.cpp | 2 +- src/d/actor/d_a_tag_photo.cpp | 8 ++++---- src/d/actor/d_a_tag_so.cpp | 2 +- src/d/actor/d_a_tori_flag.cpp | 2 +- src/d/actor/d_a_ykgr.cpp | 2 +- src/d/d_throwstone.cpp | 2 +- 56 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 6a8376b6a..739567e06 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1237,7 +1237,7 @@ BOOL daArrow_c::_delete() { } /* 800D8200-800D8220 .text daArrowCreate__FPv */ -static s32 daArrowCreate(void* i_this) { +static cPhs_State daArrowCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 705d28fd9..840439381 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -1625,7 +1625,7 @@ int daAuction_c::getRand(int max) { } /* 00003C08-00003C28 .text daAuctionCreate__FPv */ -static s32 daAuctionCreate(void* i_this) { +static cPhs_State daAuctionCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 9168ad87d..f7c856347 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -141,7 +141,7 @@ void daBeam_c::wait_proc() { } /* 00001C84-00001CA4 .text daBeamCreate__FPv */ -static s32 daBeamCreate(void* i_this) { +static cPhs_State daBeamCreate(void* i_this) { return ((daBeam_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 4fb089d0c..fdef91f2e 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -2170,7 +2170,7 @@ static BOOL daBst_Execute(bst_class* i_this) { if (i_this->mEyeHealth[j] > 0 && i_this->field_0x10D6 != 7) { actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; - actor->attention_info.distances[2] = 4; + actor->attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 4; fopAcM_seStart(i_this, JA_SE_CM_BST_HEAD_WORKING, 0); continue; @@ -2579,7 +2579,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) { } i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; - i_this->attention_info.distances[2] = 4; + i_this->attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 4; if (hio_set == 0) { i_this->mHioSet = 1; hio_set = 1; diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index bfe8b2cab..d528d13d8 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -207,7 +207,7 @@ void daCanon_c::GameInfo2DDraw() { } /* 00002074-00002094 .text daCanonCreate__FPv */ -static s32 daCanonCreate(void* i_this) { +static cPhs_State daCanonCreate(void* i_this) { return ((daCanon_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index b680c146b..a714f56ad 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -325,7 +325,7 @@ bool daDaiocta_c::_delete() { } /* 0000513C-0000515C .text daDaioctaCreate__FPv */ -static s32 daDaioctaCreate(void* i_this) { +static cPhs_State daDaioctaCreate(void* i_this) { return ((daDaiocta_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index e7c57f245..70c854cc4 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -144,7 +144,7 @@ bool daDaiocta_Eye_c::_delete() { } /* 000017B4-000017D4 .text daDaiocta_EyeCreate__FPv */ -static s32 daDaiocta_EyeCreate(void* i_this) { +static cPhs_State daDaiocta_EyeCreate(void* i_this) { return ((daDaiocta_Eye_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 7aebdf307..7b6aa6e94 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -605,7 +605,7 @@ bool daFm_c::_delete() { } /* 0000A0FC-0000A11C .text daFmCreate__FPv */ -static s32 daFmCreate(void* i_this) { +static cPhs_State daFmCreate(void* i_this) { return ((daFm_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 645a32e04..b95453559 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -98,7 +98,7 @@ void daGoal_Flag_c::RaceEnd() { } /* 000023E0-00002400 .text daGoal_FlagCreate__FPv */ -static s32 daGoal_FlagCreate(void* i_this) { +static cPhs_State daGoal_FlagCreate(void* i_this) { return ((daGoal_Flag_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index b224fc8b1..8fa4db097 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -310,7 +310,7 @@ bool daGy_c::_delete() { } /* 00005AD4-00005AF4 .text daGyCreate__FPv */ -static s32 daGyCreate(void* i_this) { +static cPhs_State daGyCreate(void* i_this) { return ((daGy_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index 4f689dcb8..b74830dc6 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -148,7 +148,7 @@ bool daGy_Ctrl_c::_delete() { } /* 00001C44-00001C64 .text daGy_CtrlCreate__FPv */ -static s32 daGy_CtrlCreate(void* i_this) { +static cPhs_State daGy_CtrlCreate(void* i_this) { return ((daGy_Ctrl_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 17ec2088d..d9a98b84c 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -97,7 +97,7 @@ bool daHot_Floor_c::_draw() { } /* 00000264-000002F8 .text daHot_FloorCreate__FPv */ -static s32 daHot_FloorCreate(void* i_this) { +static cPhs_State daHot_FloorCreate(void* i_this) { return ((daHot_Floor_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 51227a32b..6aedbba9e 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -100,7 +100,7 @@ bool daKaji_c::_draw() { } /* 000001F4-00000344 .text daKajiCreate__FPv */ -static s32 daKajiCreate(void* i_this) { +static cPhs_State daKajiCreate(void* i_this) { return ((daKaji_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index d43e62516..3d113ddc8 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -33,7 +33,7 @@ void daKmon_c::checkTalk() { } /* 000006E8-000007F8 .text daKmonCreate__FPv */ -static s32 daKmonCreate(void*) { +static cPhs_State daKmonCreate(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index 0524036f4..707084f0c 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -219,7 +219,7 @@ void daNpcAh_c::chkEndEvent() { } /* 00002338-00002358 .text daNpc_AhCreate__FPv */ -static s32 daNpc_AhCreate(void* i_this) { +static cPhs_State daNpc_AhCreate(void* i_this) { return ((daNpcAh_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 9d8a4736f..bc9854548 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -194,7 +194,7 @@ void daNpcAuction_c::clrEmitter() { } /* 000029DC-00002A0C .text daNpc_AuctionCreate__FPv */ -static s32 daNpc_AuctionCreate(void*) { +static cPhs_State daNpc_AuctionCreate(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index bf8cdfb73..6bd2a702a 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -278,7 +278,7 @@ void daNpcBmcon_c::isClear() { } /* 00003DFC-00003E1C .text daNpc_BmconCreate__FPv */ -static s32 daNpc_BmconCreate(void* i_this) { +static cPhs_State daNpc_BmconCreate(void* i_this) { return ((daNpcBmcon_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 0ae2eca16..fa3c39428 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -448,8 +448,8 @@ BOOL daNpc_Btsw_c::CreateInit() { eventInfo.setXyCheckCB(daNpc_Btsw_XyCheckCB); mEventCut.setActorInfo2("Btsw", this); - attention_info.distances[1] = 0x6F; - attention_info.distances[3] = 0x6F; + attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0x6F; + attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0x6F; field_0x9C8 = -1; field_0x952 = 0; field_0x953 = 0; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index eadc6baf6..2b1a873bf 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1183,7 +1183,7 @@ BOOL daNpc_Ji1_c::speakAction(void*) { else if(field_0xC90 == 3) { mMsgNo = 0x983; attention_info.flags |= fopAc_Attn_LOCKON_BATTLE_e; - attention_info.distances[2] = 3; + attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 3; } else { mMsgNo = 0x980; @@ -1198,7 +1198,7 @@ BOOL daNpc_Ji1_c::speakAction(void*) { else if(field_0xC90 == 3) { mMsgNo = 0x96C; attention_info.flags &= ~fopAc_Attn_LOCKON_BATTLE_e; - attention_info.distances[2] = 0xB5; + attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 0xB5; } else { mMsgNo = 0x985; diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 151644406..4471cb49c 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -146,7 +146,7 @@ void daNpc_Kg1_c::setAnm() { } /* 00001F8C-00001FAC .text daNpc_Kg1Create__FPv */ -static s32 daNpc_Kg1Create(void* i_this) { +static cPhs_State daNpc_Kg1Create(void* i_this) { return ((daNpc_Kg1_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index eaa3ed81a..658be4ae2 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -70,8 +70,8 @@ bool daNpc_Km1_c::createInit() { mEventCut.setActorInfo2("Km1", this); attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e; - attention_info.distances[1] = 0xAB; - attention_info.distances[3] = 0xA9; + attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0xAB; + attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0xA9; gravity = -4.0f; field_0x798 = current.pos; set_action(&daNpc_Km1_c::wait_action1,NULL); diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index b32b00497..06fa604e6 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -379,7 +379,7 @@ void daNpcMn_c::isChangePos(unsigned char) { } /* 00003CE8-00003D08 .text daNpc_MnCreate__FPv */ -static s32 daNpc_MnCreate(void* i_this) { +static cPhs_State daNpc_MnCreate(void* i_this) { return ((daNpcMn_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index b795fc706..89edcf7e5 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -294,7 +294,7 @@ void daNpcMt_c::changePhotoNo(u8) { } /* 00002D4C-00002D6C .text daNpc_MtCreate__FPv */ -static s32 daNpc_MtCreate(void* i_this) { +static cPhs_State daNpc_MtCreate(void* i_this) { return ((daNpcMt_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 5d57b0ada..5622ab770 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -952,7 +952,7 @@ bool daNpc_Nz_c::_delete() { } /* 00002E6C-00002E8C .text daNpc_NzCreate__FPv */ -static s32 daNpc_NzCreate(void* i_this) { +static cPhs_State daNpc_NzCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 2dbde1d58..e422351c5 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -304,7 +304,7 @@ bool daNpc_P2_c::_delete() { } /* 00004D54-00004D74 .text daNpc_P2Create__FPv */ -static s32 daNpc_P2Create(void* i_this) { +static cPhs_State daNpc_P2Create(void* i_this) { return ((daNpc_P2_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 4fd86e745..b07a99f56 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -8353,7 +8353,7 @@ void daNpcPeople_c::warp() { } /* 000098DC-000098FC .text daNpc_PeopleCreate__FPv */ -static s32 daNpc_PeopleCreate(void* i_this) { +static cPhs_State daNpc_PeopleCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 1ddada406..74bf19e99 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -2252,7 +2252,7 @@ void daNpcPhoto_c::setCollision(dCcD_Cyl* cyl, cXyz center, f32 radius, f32 heig } /* 00004D44-00004D64 .text daNpc_PhotoCreate__FPv */ -static s32 daNpc_PhotoCreate(void* i_this) { +static cPhs_State daNpc_PhotoCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 7164b677f..905e8fc7e 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -2882,7 +2882,7 @@ void daNpcRoten_c::setCollisionH() { } /* 00003F08-00003F28 .text daNpc_RotenCreate__FPv */ -static s32 daNpc_RotenCreate(void* i_this) { +static cPhs_State daNpc_RotenCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index b1aca11b6..1880ebec9 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -368,7 +368,7 @@ bool daNpc_So_c::_delete() { } /* 00004754-00004774 .text daNpc_SoCreate__FPv */ -static s32 daNpc_SoCreate(void* i_this) { +static cPhs_State daNpc_SoCreate(void* i_this) { return ((daNpc_So_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index 693289b50..6d5004f7a 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -230,7 +230,7 @@ void daNpcSv_c::isTalkOK() { } /* 00002958-00002978 .text daNpc_PeopleCreate__FPv */ -static s32 daNpc_PeopleCreate(void* i_this) { +static cPhs_State daNpc_PeopleCreate(void* i_this) { return ((daNpcSv_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index 1f178604c..43c952e9e 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -86,7 +86,7 @@ void daBalancelift_c::CreateInit() { } /* 00000F34-000010E0 .text daBalanceliftCreate__FPv */ -static s32 daBalanceliftCreate(void*) { +static cPhs_State daBalanceliftCreate(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 695b565f1..80a174480 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -250,7 +250,7 @@ void daBemos_c::getBeamActor() { } /* 00003F70-00003F90 .text daBemosCreate__FPv */ -static s32 daBemosCreate(void* i_this) { +static cPhs_State daBemosCreate(void* i_this) { return ((daBemos_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 10b469b2e..06169a2da 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -97,7 +97,7 @@ bool daObj_Bscurtain_c::_draw() { } /* 00000370-00000400 .text daObj_BscurtainCreate__FPv */ -static s32 daObj_BscurtainCreate(void* i_this) { +static cPhs_State daObj_BscurtainCreate(void* i_this) { return ((daObj_Bscurtain_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index df039fe57..d05f280b3 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -614,7 +614,7 @@ bool daObj_Canon_c::_delete() { } /* 00001C50-00001C70 .text daObj_CanonCreate__FPv */ -static s32 daObj_CanonCreate(void* i_this) { +static cPhs_State daObj_CanonCreate(void* i_this) { return ((daObj_Canon_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index fa1e1763e..c5eeaedf2 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -28,7 +28,7 @@ void daObj_Demo_Barrel_c::CreateHeap() { } /* 00000538-000005EC .text daObj_Demo_BarrelCreate__FPv */ -static s32 daObj_Demo_BarrelCreate(void*) { +static cPhs_State daObj_Demo_BarrelCreate(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 3066b9032..ed1a1d50d 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -1023,7 +1023,7 @@ int daObjFigure_c::getFigureBmd(u8 figureNo) { } /* 00001A80-00001AA0 .text daSampleCreate__FPv */ -static s32 daSampleCreate(void* i_this) { +static cPhs_State daSampleCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index 9c6aeb0e8..218819b1f 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -212,7 +212,7 @@ void daObjHat_c::setSpeed(cXyz speed) { } /* 00000A20-00000A40 .text daSampleCreate__FPv */ -static s32 daSampleCreate(void* i_this) { +static cPhs_State daSampleCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index ea75ad9c1..f120c04f9 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -278,7 +278,7 @@ bool daObj_Hole_c::_delete() { } /* 0000125C-0000127C .text daObj_HoleCreate__FPv */ -static s32 daObj_HoleCreate(void* i_actor) { +static cPhs_State daObj_HoleCreate(void* i_actor) { return static_cast(i_actor)->_create(); } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 1dc9b91e8..330f47a20 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -309,7 +309,7 @@ bool daObj_Ikada_c::_delete() { } /* 0000543C-0000545C .text daObj_IkadaCreate__FPv */ -static s32 daObj_IkadaCreate(void* i_this) { +static cPhs_State daObj_IkadaCreate(void* i_this) { return ((daObj_Ikada_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index 97be98fbe..75c006666 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -191,7 +191,7 @@ void daObjKanoke_c::setMtxHuta(cXyz*) { } /* 00001E4C-00001E6C .text daObjKanokeCreate__FPv */ -static s32 daObjKanokeCreate(void* i_this) { +static cPhs_State daObjKanokeCreate(void* i_this) { return ((daObjKanoke_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index c0b2c83c2..ef47c529f 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -108,7 +108,7 @@ bool daObjLpalm_c::_delete() { } /* 00000404-000004A4 .text daObjLpalmCreate__FPv */ -static s32 daObjLpalmCreate(void* i_this) { +static cPhs_State daObjLpalmCreate(void* i_this) { return ((daObjLpalm_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 42dc59842..e8d01c474 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -125,7 +125,7 @@ bool daObj_MjDoor_c::_draw() { } /* 00000F28-00000F48 .text daObj_MjDoorCreate__FPv */ -static s32 daObj_MjDoorCreate(void* i_this) { +static cPhs_State daObj_MjDoorCreate(void* i_this) { return ((daObj_MjDoor_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index be675b01d..259bdda0e 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -191,7 +191,7 @@ s32 daObjQuake_c::getPrmPower() { } /* 000006F8-00000718 .text daObjQuakeCreate__FPv */ -static s32 daObjQuakeCreate(void* i_this) { +static cPhs_State daObjQuakeCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index ee47911c1..b370e2b4b 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -131,7 +131,7 @@ cPhs_State daObj_Roten_c::_create() { } /* 00000410-00000530 .text daObj_RotenCreate__FPv */ -static s32 daObj_RotenCreate(void* i_actor) { +static cPhs_State daObj_RotenCreate(void* i_actor) { return static_cast(i_actor)->_create(); } diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index c816fe5e2..6b08ef564 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -76,7 +76,7 @@ BOOL daObj_Stair_c::Delete() { } /* 000004B8-000004D8 .text daObj_StairCreate__FPv */ -static s32 daObj_StairCreate(void* i_this) { +static cPhs_State daObj_StairCreate(void* i_this) { return ((daObj_Stair_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index aaa47db00..87c55e925 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -18,7 +18,7 @@ void daObj_Tousekiki_c::CreateHeap() { } /* 000002BC-000002DC .text daObj_TousekikiCreate__FPv */ -static s32 daObj_TousekikiCreate(void* i_this) { +static cPhs_State daObj_TousekikiCreate(void* i_this) { return ((daObj_Tousekiki_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index 93cdc6f65..5e4d87392 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -267,7 +267,7 @@ bool daObj_Warpt_c::_delete() { } /* 00002858-00002878 .text daObj_WarptCreate__FPv */ -static s32 daObj_WarptCreate(void* i_this) { +static cPhs_State daObj_WarptCreate(void* i_this) { return ((daObj_Warpt_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index d80b43e94..f6e44ba0b 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -1868,7 +1868,7 @@ bool daRd_c::_delete() { } /* 00004FB8-00004FD8 .text daRdCreate__FPv */ -static s32 daRdCreate(void* i_this) { +static cPhs_State daRdCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 556147584..4b2d7a6d6 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -143,7 +143,7 @@ void daSalvage_c::debugDraw() { } /* 00002410-00002430 .text daSalvageCreate__FPv */ -static s32 daSalvageCreate(void* i_this) { +static cPhs_State daSalvageCreate(void* i_this) { return ((daSalvage_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index 278ae92fa..d0dbf1028 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -240,7 +240,7 @@ bool daSie_Flag_c::_draw() { } /* 00000B94-00000BB4 .text daSie_FlagCreate__FPv */ -static s32 daSie_FlagCreate(void* i_this) { +static cPhs_State daSie_FlagCreate(void* i_this) { return ((daSie_Flag_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index 3a3f69d59..166774ebe 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -134,7 +134,7 @@ bool daTag_Gship_c::_delete() { } /* 000005F4-00000614 .text daTag_GshipCreate__FPv */ -static s32 daTag_GshipCreate(void* i_this) { +static cPhs_State daTag_GshipCreate(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 1bdc06fc6..ec109a3b3 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -115,7 +115,7 @@ cPhs_State daTagPhoto_c::_create() { NULL }; - dComLbG_PhaseHandler(&mPhs, l_method, this); + return dComLbG_PhaseHandler(&mPhs, l_method, this); } /* 000001C8-000001D0 .text createHeap__12daTagPhoto_cFv */ @@ -129,8 +129,8 @@ cPhs_State daTagPhoto_c::createInit() { mPhotoTalk2EventIdx = dComIfGp_evmng_getEventIdx("PHOTO_TALK2"); mEventCut.setActorInfo("TagPo", this); eventInfo.setEventId(mPhotoTalk2EventIdx); - attention_info.distances[1] = 0x23; - attention_info.distances[3] = 0x24; + attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0x23; + attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0x24; attention_info.flags = fopAc_Attn_TALKFLAG_CHECK_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_LOCKON_TALK_e; shape_angle = current.angle; @@ -373,7 +373,7 @@ u8 daTagPhoto_c::getPrmTagNo() { } /* 00000928-00000948 .text daTagPhotoCreate__FPv */ -static s32 daTagPhotoCreate(void* i_this) { +static cPhs_State daTagPhotoCreate(void* i_this) { return ((daTagPhoto_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index 7a12dfc5f..20732551e 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -66,7 +66,7 @@ bool daTag_So_c::_delete() { } /* 00000284-000002A4 .text daTag_SoCreate__FPv */ -static s32 daTag_SoCreate(void* i_this) { +static cPhs_State daTag_SoCreate(void* i_this) { return ((daTag_So_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 89eba16dd..4c7b2b220 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -129,7 +129,7 @@ cPhs_State daTori_Flag_c::_create() { } /* 000003A4-000003C4 .text daTori_FlagCreate__FPv */ -static s32 daTori_FlagCreate(void* i_this) { +static cPhs_State daTori_FlagCreate(void* i_this) { return ((daTori_Flag_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 8370be612..f9dc66a17 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -23,7 +23,7 @@ void daYkgr_c::getPosRate() { } /* 00000408-00000428 .text daYkgrCreate__FPv */ -static s32 daYkgrCreate(void* i_this) { +static cPhs_State daYkgrCreate(void* i_this) { return ((daYkgr_c*)i_this)->_create(); } diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 6711050c3..8c63da1b1 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -55,7 +55,7 @@ cPhs_State daThrowstone_c::_create() { } /* 8023B5DC-8023B6DC .text daThrowstoneCreate__FPv */ -static s32 daThrowstoneCreate(void* ptr) { +static cPhs_State daThrowstoneCreate(void* ptr) { return ((daThrowstone_c*)ptr)->_create(); }