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

d_camera / m_Do_ext / d_particle + minor various wip (#210)

Browse Source
This commit is contained in:
TakaRikka
2022-10-03 15:26:26 -07:00
committed by GitHub
parent 0309490521
commit 4913395dbd
267 changed files with 5153 additions and 8112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/cc/d_cc_mass_s.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitI
if (field_0x200 & 0x10) {
Vec vec;
PSVECSubtract(&(*p_actor)->mCurrent.mPosition, p_xyz, &vec);
PSVECSubtract(&(*p_actor)->current.pos, p_xyz, &vec);
vec.y = 0;
f32 vecMag = PSVECMag(&vec);
if (cM3d_IsZero(vecMag)) {
src/d/cc/d_cc_uty.cpp
+4 -4
View File
@@ -454,12 +454,12 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) {
p_info->mHitDirection = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f);
} else {
if (fopAcM_GetName(p_info->mpActor) == PROC_BOOMERANG) {
f32 x_diff = p_enemy->mCurrent.mPosition.x - link->mCurrent.mPosition.x;
f32 z_diff = p_enemy->mCurrent.mPosition.z - link->mCurrent.mPosition.z;
f32 x_diff = p_enemy->current.pos.x - link->current.pos.x;
f32 z_diff = p_enemy->current.pos.z - link->current.pos.z;
p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f);
} else {
f32 x_diff = p_enemy->mCurrent.mPosition.x - p_info->mpActor->mCurrent.mPosition.x;
f32 z_diff = p_enemy->mCurrent.mPosition.z - p_info->mpActor->mCurrent.mPosition.z;
f32 x_diff = p_enemy->current.pos.x - p_info->mpActor->current.pos.x;
f32 z_diff = p_enemy->current.pos.z - p_info->mpActor->current.pos.z;
p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff);
}
}