From 5f056105b3e15e8b2c845d00830264cd94c84bfe Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 12 Aug 2026 12:18:36 -0400 Subject: [PATCH] d_a_magma OK for demo --- configure.py | 2 +- include/d/actor/d_a_magma.h | 2 +- src/d/actor/d_a_magma.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.py b/configure.py index e238659bb..688cee7fe 100755 --- a/configure.py +++ b/configure.py @@ -1451,7 +1451,7 @@ config.libs = [ ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lamp"), ActorRel(NonMatching, "d_a_lod_bg"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lwood"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_magma"), + ActorRel(Matching, "d_a_magma"), ActorRel(Matching, "d_a_majuu_flag"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mdoor"), ActorRel(MatchingFor("D44J01"), "d_a_msw"), diff --git a/include/d/actor/d_a_magma.h b/include/d/actor/d_a_magma.h index 681ecf0e1..30388ab2a 100644 --- a/include/d/actor/d_a_magma.h +++ b/include/d/actor/d_a_magma.h @@ -9,7 +9,7 @@ class daMagma_c : public fopAc_ac_c { public: inline ~daMagma_c(); inline cPhs_State create(); - inline s32 getPathNo() { return fopAcM_GetParam(this); } + inline s16 getPathNo() { return fopAcM_GetParam(this); } public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index edecfc569..94cae3930 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -10,11 +10,11 @@ #include "d/d_magma.h" daMagma_c::~daMagma_c() { - dComIfG_resDelete(&mPhs, "Magma"); + dComIfG_resDeleteDemo(&mPhs, "Magma"); } cPhs_State daMagma_c::create() { - fopAcM_ct(this, daMagma_c); + fopAcM_ct_Retail(this, daMagma_c); cPhs_State result = dComIfG_resLoad(&mPhs, "Magma"); if (result != cPhs_COMPLEATE_e) { @@ -25,7 +25,7 @@ cPhs_State daMagma_c::create() { dComIfGp_getMagma()->newFloor( current.pos, scale, - current.roomNo, + fopAcM_GetRoomNo(this), getPathNo() ); }