diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-03 18:09:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-03 15:09:56 -0800 |
| commit | f97d334732201e5a8e1250318925c90d0c715225 (patch) | |
| tree | dffb749eaa0db03a031d854c319dc7e8f6d8e7b5 /src/SSystem | |
| parent | 5716efc4c86f5e7e03263f0ed426c5e9ae834cd3 (diff) | |
Debug+retail matches and clean up some fakematches (#2910)
* Debug matches
* Match daAlink_c::procGrassWhistleWait
* Match JASAramStream::channelProc
* More debug matches
* Match JAUStreamStaticAramMgr_::deleteStreamAram and bitset inlines
* Fix some fakematches
* Fix gameinfo player info not being a struct
* Update bug comments
* Fix procids in alink
* d_a_scene_exit OK
Diffstat (limited to 'src/SSystem')
| -rw-r--r-- | src/SSystem/SComponent/c_m3d.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp index 1eea1ff0d9..726ceeeedf 100644 --- a/src/SSystem/SComponent/c_m3d.cpp +++ b/src/SSystem/SComponent/c_m3d.cpp @@ -39,19 +39,20 @@ static f32 dummy(f32 x) { bool cM3d_Len2dSqPntAndSegLine(f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 p5, f32 p6, f32* param_7, f32* param_8, f32* param_9) { bool retVal = false; - f32 param_5 = p5 - param_3; - f32 param_6 = p6 - param_4; - f32 len = param_5 * param_5 + param_6 * param_6; + f32 f31 = p5 - param_3; + f32 f30 = p6 - param_4; + f32 len = f31 * f31 + f30 * f30; + f32 f29; if (cM3d_IsZero(len)) { *param_9 = 0.0f; - return retVal; + return false; } else { - len = (param_5 * (param_1 - param_3) + param_6 * (param_2 - param_4)) / len; - if (len >= 0.0f && len <= 1.0f) { + f29 = (f31 * (param_1 - param_3) + f30 * (param_2 - param_4)) / len; + if (f29 >= 0.0f && f29 <= 1.0f) { retVal = true; } - *param_7 = param_3 + param_5 * len; - *param_8 = param_4 + param_6 * len; + *param_7 = param_3 + f31 * f29; + *param_8 = param_4 + f30 * f29; *param_9 = cM3d_Len2dSq(*param_7, *param_8, param_1, param_2); return retVal; } |
