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 /include/d | |
| 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 'include/d')
| -rw-r--r-- | include/d/actor/d_a_player.h | 2 | ||||
| -rw-r--r-- | include/d/d_bg_s_sph_chk.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 275572e46c..14398e88a8 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -1131,7 +1131,7 @@ public: static bool checkWolfCargoCarrySceneChange() { return getLastSceneMode() == 10; } static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; } - static u8 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; } + static u32 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; } static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; } diff --git a/include/d/d_bg_s_sph_chk.h b/include/d/d_bg_s_sph_chk.h index 460bceb937..15cb92883f 100644 --- a/include/d/d_bg_s_sph_chk.h +++ b/include/d/d_bg_s_sph_chk.h @@ -8,7 +8,7 @@ struct cBgD_Vtx_t; class dBgS_SphChk; -typedef void* (*SphChk_Callback)(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*); +typedef void (*SphChk_Callback)(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*); class dBgS_SphChk : public cM3dGSph, public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk { public: |