mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove "duplicated" inlines (#2099)

Browse Source 
* fix f_op_actor_mng inlines

* fix f_pc inlines

* fix d_a_alink weak func signatures

* fix d_com_inf_game inlines

* fix some more inlines

* fix rest of player inlines

* m_Do / JSystem inlines fixed

* fix upstream changes
This commit is contained in:
TakaRikka
2024-03-19 04:31:53 -07:00
committed by GitHub
parent 38e0f8927a
commit 25d51079a3
347 changed files with 3968 additions and 3888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_npc_cd2.cpp
+4 -4
View File
@@ -1873,9 +1873,9 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
s32 jntNum = a_jntNumTbl[idx][x];
if (i_model && jntNum >= 0) {
g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
mDoMtx_copy(mpMorf->getModel()->i_getAnmMtx(jntNum), mDoMtx_stack_c::now);
mDoMtx_copy(mpMorf->getModel()->getAnmMtx(jntNum), mDoMtx_stack_c::now);
mDoMtx_stack_c::scaleM(i_scale, i_scale, i_scale);
i_model->i_setBaseTRMtx(mDoMtx_stack_c::now);
i_model->setBaseTRMtx(mDoMtx_stack_c::now);
mDoExt_modelUpdateDL(i_model);
}
return 1;
@@ -1994,7 +1994,7 @@ static void* s_sub1(void* param_0, void* param_1) {
void* daNpcCd2_c::getEscapeTag() {
target = NULL;
wolfAngle = fopAcM_searchPlayerAngleY(this);
i_fpcM_Search(s_sub1, this);
fpcM_Search(s_sub1, this);
return target;
}
@@ -2190,7 +2190,7 @@ fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
if (fopAcM_CheckCondition(field_0x00, 4)) {
return NULL;
}
i_fpcM_Search(s_sub, this);
fpcM_Search(s_sub, this);
if (field_0x04) {
setAvoidPoint();
}