From 792471426642fe41df53a5464e3ce357a0f11250 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Tue, 27 May 2025 03:47:39 +0100 Subject: [PATCH] Apply feedback --- config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt | 12 ++++++------ include/d/a/obj/d_a_obj_stream_lava.h | 7 +------ src/REL/d/a/obj/d_a_obj_stream_lava.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt b/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt index 8bd794ad..f84ccac6 100644 --- a/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_stream_lavaNP/symbols.txt @@ -8,7 +8,7 @@ __dt__29sFState_c<16dAcOstreamLava_c>Fv = .text:0x00000230; // type:function siz __dt__32sFStateFct_c<16dAcOstreamLava_c>Fv = .text:0x00000290; // type:function size:0x6C __dt__85sStateMgr_c<16dAcOstreamLava_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000300; // type:function size:0xA0 __dt__55sFStateMgr_c<16dAcOstreamLava_c,20sStateMethodUsr_FI_c>Fv = .text:0x000003A0; // type:function size:0xA4 -fn_405_450 = .text:0x00000450; // type:function size:0x40 +__dt__14dScnCallback_cFv = .text:0x00000450; // type:function size:0x40 createHeap__16dAcOstreamLava_cFv = .text:0x00000490; // type:function size:0x200 create__16dAcOstreamLava_cFv = .text:0x00000690; // type:function size:0x1A4 changeState__85sStateMgr_c<16dAcOstreamLava_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000840; // type:function size:0x10 @@ -24,11 +24,11 @@ executeState_Stream__16dAcOstreamLava_cFv = .text:0x00000B50; // type:function s finalizeState_Stream__16dAcOstreamLava_cFv = .text:0x00000BE0; // type:function size:0x4 __dt__16dAcOstreamLava_cFv = .text:0x00000BF0; // type:function size:0xFC getStateID__85sStateMgr_c<16dAcOstreamLava_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000CF0; // type:function size:0x10 -fn_405_D00 = .text:0x00000D00; // type:function size:0x4 -fn_405_D10 = .text:0x00000D10; // type:function size:0x4 -fn_405_D20 = .text:0x00000D20; // type:function size:0x4 -fn_405_D30 = .text:0x00000D30; // type:function size:0x4 -fn_405_D40 = .text:0x00000D40; // type:function size:0x4 +ExecCallback_DRAW_XLU__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D00; // type:function size:0x4 +ExecCallback_DRAW_OPA__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D10; // type:function size:0x4 +ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D20; // type:function size:0x4 +ExecCallback_CALC_WORLD__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D30; // type:function size:0x4 +ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv = .text:0x00000D40; // type:function size:0x4 build__32sFStateFct_c<16dAcOstreamLava_c>FRC12sStateIDIf_c = .text:0x00000D50; // type:function size:0x60 dispose__32sFStateFct_c<16dAcOstreamLava_c>FRP10sStateIf_c = .text:0x00000DB0; // type:function size:0xC initialize__29sFState_c<16dAcOstreamLava_c>Fv = .text:0x00000DC0; // type:function size:0x1C diff --git a/include/d/a/obj/d_a_obj_stream_lava.h b/include/d/a/obj/d_a_obj_stream_lava.h index e4808e26..78857b24 100644 --- a/include/d/a/obj/d_a_obj_stream_lava.h +++ b/include/d/a/obj/d_a_obj_stream_lava.h @@ -13,7 +13,7 @@ class dAcOstreamLava_c : public dAcObjBase_c { public: - dAcOstreamLava_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr), mScnCallback(nullptr) {} + dAcOstreamLava_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr), mScnCallback(this) {} virtual int create() override; virtual int doDelete() override; virtual int draw() override; @@ -29,11 +29,6 @@ private: static u32 eventFlags1; static u32 eventFlags2; - static void eventIn_Wrapper(void *arg); - void eventIn(); - static void eventEnd_Wrapper(void *arg); - void eventEnd(); - /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; /* 0x350 */ m3d::anmTexSrt_c mAnmTexSrtWait; diff --git a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp index 25715c5f..8578a76f 100644 --- a/src/REL/d/a/obj/d_a_obj_stream_lava.cpp +++ b/src/REL/d/a/obj/d_a_obj_stream_lava.cpp @@ -46,11 +46,11 @@ bool dAcOstreamLava_c::createHeap() { TRY_CREATE(mModel.create(mdl, &heap_allocator, 0x32C)); anmSrtWait = mResFile.GetResAnmTexSrt("Wait"); - TRY_CREATE(mAnmTexSrtWait.create(mdl, anmSrtWait, &heap_allocator, 0x0, 1)); + TRY_CREATE(mAnmTexSrtWait.create(mdl, anmSrtWait, &heap_allocator, nullptr, 1)); mModel.setAnm(mAnmTexSrtWait); anmClr = mResFile.GetResAnmClr(AcOstreamLava__AnmClrNames[mSubtype]); - TRY_CREATE(mAnmMatClr.create(mdl, anmClr, &heap_allocator, 0x0, 1)); + TRY_CREATE(mAnmMatClr.create(mdl, anmClr, &heap_allocator, nullptr, 1)); void *dzb = getOarcFile(AcOstreamLava__OarcNames[mSubtype], AcOstreamLava__DbzNames[mSubtype]); void *plc = getOarcFile(AcOstreamLava__OarcNames[mSubtype], AcOstreamLava__PlcNames[mSubtype]); @@ -109,10 +109,10 @@ int dAcOstreamLava_c::actorExecute() { dRoom_c *currentRoom = dStage_c::GetInstance()->getRoom(roomid); if (currentRoom->checkFlag(2)) { - mObjectActorFlags |= 0x200; + setObjectProperty(0x200); return SUCCEEDED; } else { - mObjectActorFlags &= ~0x200; + clearObjectProperty(0x200); return SUCCEEDED; } }