mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 05:14:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix daObjGnntakis_c::create_heap regalloc for demo

Browse Source
This commit is contained in:
LagoLunatic
2026-04-17 13:03:56 -04:00
parent 9901be8103
commit 6aa7ba91f3
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1705,7 +1705,7 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship2"),
ActorRel(Matching, "d_a_obj_gnnbtltaki"),
ActorRel(Matching, "d_a_obj_gnndemotakie"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gnndemotakis"),
ActorRel(Matching, "d_a_obj_gnndemotakis"),
ActorRel(Matching, "d_a_obj_gong"),
ActorRel(Matching, "d_a_obj_gtaki"),
ActorRel(NonMatching, "d_a_obj_hami2"),
src/d/actor/d_a_obj_gnndemotakie.cpp
+1
View File
@@ -23,6 +23,7 @@ BOOL daObjGnntakie_c::create_heap() {
BOOL ret = FALSE;
mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIE_BDL_GNN_DEMO_TAKI_E));
JUT_ASSERT(90, mdl_data != NULL);
if (mdl_data != NULL) {
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
if (mpModel != NULL) {
src/d/actor/d_a_obj_gnndemotakis.cpp
+12 -12
View File
@@ -18,16 +18,17 @@ BOOL daObjGnntakis_c::solidHeapCB(fopAc_ac_c* a_this) {
/* 00000098-000001F4 .text create_heap__15daObjGnntakis_cFv */
BOOL daObjGnntakis_c::create_heap() {
/* Nonmatching */
J3DModelData* mdl_data;
J3DAnmTextureSRTKey* btk_data;
BOOL ret = FALSE;
J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BDL_GNN_DEMO_TAKI_S));
JUT_ASSERT(0x9b, mdl_data != NULL);
mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BDL_GNN_DEMO_TAKI_S));
JUT_ASSERT(155, mdl_data != NULL);
if (mdl_data != NULL) {
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
if (mpModel != NULL) {
J3DAnmTextureSRTKey* btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BTK_GNN_DEMO_TAKI_S));
JUT_ASSERT(0xa2, btk_data != NULL);
btk_data = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, GNNDEMOTAKIS_BTK_GNN_DEMO_TAKI_S));
JUT_ASSERT(162, btk_data != NULL);
if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, TRUE, 0, 1.0f, 0, -1, FALSE, 0)) {
ret = TRUE;
}
@@ -40,21 +41,21 @@ BOOL daObjGnntakis_c::create_heap() {
cPhs_State daObjGnntakis_c::_create() {
fopAcM_SetupActor(this, daObjGnntakis_c);
cPhs_State PVar1 = dComIfG_resLoad(&mPhs, M_arcname);
cPhs_State state = dComIfG_resLoad(&mPhs, M_arcname);
if (PVar1 == cPhs_COMPLEATE_e) {
PVar1 = cPhs_ERROR_e;
if (state == cPhs_COMPLEATE_e) {
state = cPhs_ERROR_e;
if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
init_mtx();
mpBtkAnm.getFrameCtrl()->setFrame(mpBtkAnm.getStartFrame());
mpBtkAnm.setPlaySpeed(0.0f);
PVar1 = cPhs_COMPLEATE_e;
state = cPhs_COMPLEATE_e;
m2B0 = FALSE;
}
}
return PVar1;
return state;
}
/* 000003AC-000003DC .text _delete__15daObjGnntakis_cFv */
@@ -74,8 +75,7 @@ bool daObjGnntakis_c::_execute() {
dComIfGp_event_runCheck() != FALSE &&
dComIfGp_evmng_startCheck("g2before") &&
dComIfGp_demo_get()) {
if (m2B0 == 0 &&
dComIfGp_demo_get()->getFrameNoMsg() >= 0x11d9) {
if (m2B0 == 0 && dComIfGp_demo_get()->getFrameNoMsg() >= 0x11d9) {
mpBtkAnm.setFrame(mpBtkAnm.getStartFrame());
mpBtkAnm.setPlaySpeed(1.0f);
m2B0 = TRUE;