mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 23:27:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_cstatue.cpp
+18 -18
View File
@@ -122,7 +122,7 @@ static dCcD_SrcSph l_sphSrc = {
};
void daCstatue_c::atHitCallback(fopAc_ac_c* actor) {
if (fopAcM_GetName(actor) == PROC_B_GM) {
if (fopAcM_GetName(actor) == fpcNm_B_GM_e) {
onStateFlg0(daCstatue_FLG0_100);
}
}
@@ -358,7 +358,7 @@ int daCstatue_c::create() {
mControlDistanceOffset = JMAFastSqrt(4825.0f);
mTargetFrame = 21.0f;
} else {
fopAcM_OffStatus(this, 0x100);
fopAcM_OffStatus(this, fopAcStts_CULL_e);
mCyl1.SetR(300.0f);
mCyl1.SetH(600.0f);
mAcchCir[0].SetWall(30.01f, 300.0f);
@@ -1156,10 +1156,10 @@ int daCstatue_c::execute() {
fopAcM_GetRoomNo(this), 1.0f, speedF);
if (fopAcM_checkCarryNow(this)) {
onStateFlg0(daCstatue_FLG0_2);
fopAcM_OffStatus(this, 0x400);
fopAcM_OffStatus(this, fopAcStts_FREEZE_e);
} else {
offStateFlg0(daCstatue_FLG0_2);
fopAcM_OnStatus(this, 0x400);
fopAcM_OnStatus(this, fopAcStts_FREEZE_e);
}
if (mParam2 != 0x3f) {
dTres_c::setIconPositionOfCstatue(mParam2, &current.pos);
@@ -1215,20 +1215,20 @@ static actor_method_class l_daCstatue_Method = {
};
actor_process_profile_definition g_profile_CSTATUE = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CSTATUE, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daCstatue_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
271, // mPriority
&l_daCstatue_Method, // sub_method
0x00060520, // mStatus
fopAc_ENV_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CSTATUE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCstatue_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_CSTATUE_e,
/* Actor SubMtd */ &l_daCstatue_Method,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e,
/* Group */ fopAc_ENV_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;