diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-30 00:32:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-29 21:32:11 -0800 |
| commit | 3c1323cf0dce40fa4bdf04a0a6b2f466c1be6eb5 (patch) | |
| tree | 0f41efe6cb6fc8806f69389b2830a795c8bfb645 /src | |
| parent | 7abe8d4a40163dd812461d16c47fc897ddf39303 (diff) | |
d_a_npc_moir OK (#2894)
* d_a_npc_moir OK
* Remove old comment
Diffstat (limited to 'src')
| -rw-r--r-- | src/d/actor/d_a_npc_moir.cpp | 8 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_dust.cpp | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index da3acb45bf..77a4a5f507 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1962,8 +1962,14 @@ void daNpcMoiR_c::checkHeadGear() { } } +static void dummy() { + // This dummy function is needed to fix JMath::TSinCosTable::sinShort not being inlined in daNpcMoiR_c::ctrlBtk. + // It's unclear why that happens, or why an unused dummy function calling the inline fixes it. + // Seems like a compiler bug of some sort. + cM_ssin(0); +} + /* 80A8210C-80A821E0 00608C 00D4+00 1/0 0/0 0/0 .text ctrlBtk__11daNpcMoiR_cFv */ -// NONMATCHING inlining issues BOOL daNpcMoiR_c::ctrlBtk() { if (mpMatAnm != NULL) { J3DAnmTextureSRTKey* anm = NULL; diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 7a9e3250d5..5271e916f4 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -208,7 +208,6 @@ int daObjDust_c::Create() { } /* 80BE2B30-80BE2E9C 0008F0 036C+00 1/0 0/0 0/0 .text Execute__11daObjDust_cFPPA3_A4_f */ -// NONMATCHING somehow this needs to not inline TSinCosTable<13,f32>::sinShort int daObjDust_c::Execute(Mtx** i_mtx) { fopAcM_seStartLevel(this, Z2SE_OBJ_FLOATBOARD, 0); daPy_py_c* player = daPy_getPlayerActorClass(); |