diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-26 21:50:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-26 18:50:46 -0700 |
| commit | 6242aa6e8411cd6bbcfec5ee4f421950a62cae8d (patch) | |
| tree | b8fe4ac0f56c8afbbdb49c67dbe0063b09181a42 /src/d/d_camera.cpp | |
| parent | 30fafe135d20aaad8c9efc4c0a2de1e216822487 (diff) | |
Misc matches and fixes (#2703)
* Match mDoExt_morf_c::getPlayMode
* Misc cleanup
* Fix actor cull spheres
* Match daPy_py_c::getLastSceneSwordAtUpTime, JUTGamePad::testTrigger
* Fix improper demangling of dBgS_SphChk::SetCallback
* Fix d_camera rangef weak func order
* Match more alink_wolf funcs
Diffstat (limited to 'src/d/d_camera.cpp')
| -rw-r--r-- | src/d/d_camera.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 3be0aa1a49..d391798469 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -40,7 +40,7 @@ static f32 limitf(f32 value, f32 min, f32 max) { return value; } -static f32 rangef(f32 value1, f32 value2, f32 ratio) { +static inline f32 rangef(f32 value1, f32 value2, f32 ratio) { return value1 + (value2 - value1) * ratio; } @@ -2336,7 +2336,7 @@ u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) { /* 80165C08-80165CE0 160548 00D8+00 1/1 0/0 0/0 .text * sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */ -static void* sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_vtxIdx0, +static void sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_vtxIdx0, int i_vtxIdx1, int i_vtxIdx2, cM3dGPla* i_plane, void* i_data) { camSphChkdata* sph_chk_data = (camSphChkdata*)i_data; if (!sph_chk_data->field_0x1c) { @@ -2348,7 +2348,6 @@ static void* sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i sph_chk_data->field_0x1c = true; } } - //! @bug Function does not return a value } /* 80165CE0-80165E74 160620 0194+00 1/1 0/0 0/0 .text compWallMargin__9dCamera_cFP4cXyzP4cXyzf */ |