falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_moir OK (#2894) 

* d_a_npc_moir OK

* Remove old comment
This commit is contained in:
LagoLunatic 2025-11-30 00:32:11 -05:00 committed by GitHub
parent 7abe8d4a40
commit 3c1323cf0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -1911,7 +1911,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_midp"),
ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_mk"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moi"),
ActorRel(NonMatching, "d_a_npc_moir"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moir"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_myna2"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_ne"),
ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_p2"),

8
src/d/actor/d_a_npc_moir.cpp
View File

@ -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;

1
src/d/actor/d_a_obj_dust.cpp
View File

@ -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();