mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-26 06:16:24 -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_obj_tobyhouse.cpp
+16 -16
View File
@@ -64,7 +64,7 @@ static void* s_b_sub(void* i_actor, void* i_data) {
bomb->deleteBombAndEffect();
}
} else {
if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) {
if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) {
daObjCarry_c* carry = (daObjCarry_c*)i_actor;
if (carry != NULL && data != NULL &&
carry->getType() == 2 && carry->current.pos.absXZ(data->current.pos) < 1000.0f)
@@ -326,7 +326,7 @@ void daObjTobyHouse_c::demoProc() {
static Vec l_shotSmokeOffset = {0.0f, 2500.0f, -600.0f};
cXyz cStack_24;
csXyz cStack_98;
fopAcM_SearchByName(PROC_NPC_TOBY);
fopAcM_SearchByName(fpcNm_NPC_TOBY_e);
cXyz cStack_30(-600.0f, 70.0f, 380.0f);
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
cXyz* pCamEye = fopCamM_GetEye_p(camera);
@@ -601,20 +601,20 @@ static actor_method_class daObjTobyHouse_METHODS = {
};
actor_process_profile_definition g_profile_Obj_TobyHouse = {
fpcLy_CURRENT_e, // mLayerID
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Obj_TobyHouse, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daObjTobyHouse_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
546, // mPriority
&daObjTobyHouse_METHODS, // sub_method
0x00040100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 3,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Obj_TobyHouse_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daObjTobyHouse_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_Obj_TobyHouse_e,
/* Actor SubMtd */ &daObjTobyHouse_METHODS,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;