From 93dbb4a0a94d77be93c71b7192b8960a9ae83b6d Mon Sep 17 00:00:00 2001 From: swekka Date: Sun, 7 Sep 2025 17:35:26 +0200 Subject: [PATCH] d_a_obj_amber OK --- configure.py | 2 +- src/REL/d/a/obj/d_a_obj_amber.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index d2aca699..008491d0 100644 --- a/configure.py +++ b/configure.py @@ -2300,7 +2300,7 @@ config.libs = [ Rel(NonMatching, "d_a_npc_zelda", "REL/d/a/npc/d_a_npc_zelda.cpp"), Rel(NonMatching, "d_a_nusi_base", "REL/d/a/d_a_nusi_base.cpp"), Rel(NonMatching, "d_a_nusi_npc", "REL/d/a/d_a_nusi_npc.cpp"), - Rel(NonMatching, "d_a_obj_amber", "REL/d/a/obj/d_a_obj_amber.cpp"), + Rel(Matching, "d_a_obj_amber", "REL/d/a/obj/d_a_obj_amber.cpp"), Rel( NonMatching, "d_a_obj_ancient_jewels", "REL/d/a/obj/d_a_obj_ancient_jewels.cpp" ), diff --git a/src/REL/d/a/obj/d_a_obj_amber.cpp b/src/REL/d/a/obj/d_a_obj_amber.cpp index 9d915dfe..7c0285d2 100644 --- a/src/REL/d/a/obj/d_a_obj_amber.cpp +++ b/src/REL/d/a/obj/d_a_obj_amber.cpp @@ -49,8 +49,10 @@ int dAcOAmber_c::actorPostCreate() { mShadowRot.w = ((mMax - mMin) * 0.5f).mag(); updateMatrix(); mMdl.setLocalMtx(mWorldMtx); - if (dBgS_ObjGndChk::CheckPos(position + mVec3_c::Ey * mMax.y)) { - field_0x37c = position.y - dBgS_ObjGndChk::GetGroundHeight() < 0.0f ? 0.0f : dBgS_ObjGndChk::GetGroundHeight(); + mVec3_c chkPos = position + mVec3_c::Ey * mMax.y; + if (dBgS_ObjGndChk::CheckPos(chkPos)) { + f32 deltaHeight = position.y - dBgS_ObjGndChk::GetGroundHeight(); + field_0x37c = deltaHeight < 0.0f ? 0.0f : deltaHeight; } else { field_0x37c = 1.0e+9f; }