From df9e406095d7f5d778b911a2e0e4beefac348142 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 13 Sep 2026 10:27:01 +0200 Subject: [PATCH] Review --- config/SOUE01/symbols.txt | 6 +++--- include/toBeSorted/salvage_mgr.h | 6 +++--- src/d/a/d_a_salbage_obj.cpp | 2 +- src/toBeSorted/salvage_mgr.cpp | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 6d68f893..a82abeab 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -3655,8 +3655,8 @@ getCarryRotMtx__13dSalvageMgr_cCFRCl = .text:0x800A5A20; // type:function size:0 setPickupIndex__13dSalvageMgr_cFRCl = .text:0x800A5AB0; // type:function size:0x84 deleteObjAndSlb__13dSalvageMgr_cFv = .text:0x800A5B40; // type:function size:0x4C checkIsOnDeliveryStage2__13dSalvageMgr_cCFv = .text:0x800A5B90; // type:function size:0x1C -startedQuestForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5BB0; // type:function size:0x5C -startedQuestForId__13dSalvageMgr_cCFRCl = .text:0x800A5C10; // type:function size:0x7C +hasStartedQuestForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5BB0; // type:function size:0x5C +hasStartedQuestForId__13dSalvageMgr_cCFRCl = .text:0x800A5C10; // type:function size:0x7C hasDowsingForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5C90; // type:function size:0x5C hasDowsingForId__13dSalvageMgr_cCFRCl = .text:0x800A5CF0; // type:function size:0xB8 getDeliverToActorId__13dSalvageMgr_cFl = .text:0x800A5DB0; // type:function size:0x18 @@ -3666,7 +3666,7 @@ checkDeliveredStoryflag__13dSalvageMgr_cCFRCl = .text:0x800A5DF0; // type:functi unsetPickupStoryflag__13dSalvageMgr_cFRCl = .text:0x800A5E70; // type:function size:0xBC checkPickupStoryflag__13dSalvageMgr_cCFRCl = .text:0x800A5F30; // type:function size:0x7C checkIsOnDeliveryStage__13dSalvageMgr_cCFv = .text:0x800A5FB0; // type:function size:0x5C -findDeliverToActor__13dSalvageMgr_cFv = .text:0x800A6010; // type:function size:0x48 +findDeliveryTarget__13dSalvageMgr_cFv = .text:0x800A6010; // type:function size:0x48 triggerDeliveryEvent__13dSalvageMgr_cFv = .text:0x800A6060; // type:function size:0xBC getTalkEntryPoint1ForPickup__13dSalvageMgr_cFP12dAcObjBase_c = .text:0x800A6120; // type:function size:0x98 getTalkEntryPoint2ForPickup__13dSalvageMgr_cFP12dAcObjBase_c = .text:0x800A61C0; // type:function size:0x9C diff --git a/include/toBeSorted/salvage_mgr.h b/include/toBeSorted/salvage_mgr.h index 32577a4c..a848ace9 100644 --- a/include/toBeSorted/salvage_mgr.h +++ b/include/toBeSorted/salvage_mgr.h @@ -21,7 +21,7 @@ public: bool checkDeliveredStoryflag(const s32 &id) const; bool checkPickupStoryflag(const s32 &id) const; - bool startedQuestForSalvageObj(const dAcSalbageObj_c *obj) const; + bool hasStartedQuestForSalvageObj(const dAcSalbageObj_c *obj) const; bool hasDowsingForSalvageObj(const dAcSalbageObj_c *obj) const; mMtx_c getCarryRotMtx(const s32 &id) const; mMtx_c getCarryRotMtx2(const s32 &id) const { @@ -44,8 +44,8 @@ public: bool checkIsOnDeliveryStage() const; bool checkIsOnDeliveryStage2() const; u16 getDeliverToActorId(s32 id); - dAcObjBase_c *findDeliverToActor(); - bool startedQuestForId(const s32 &id) const; + dAcObjBase_c *findDeliveryTarget(); + bool hasStartedQuestForId(const s32 &id) const; bool hasDowsingForId(const s32 &id) const; void noop(); diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp index d700e44c..6fef71f6 100644 --- a/src/d/a/d_a_salbage_obj.cpp +++ b/src/d/a/d_a_salbage_obj.cpp @@ -323,7 +323,7 @@ void dAcSalbageObj_c::executeState_Wait() { dAcObjBase_c::create(fProfile::NPC_SLB, mRoomID, 0xFFFFFD01, &pos, nullptr, nullptr, -1); } - if (dSalvageMgr_c::sInstance->startedQuestForSalvageObj(this)) { + if (dSalvageMgr_c::sInstance->hasStartedQuestForSalvageObj(this)) { addAttentionTargetIfNeeded(); } } diff --git a/src/toBeSorted/salvage_mgr.cpp b/src/toBeSorted/salvage_mgr.cpp index 9e602e8a..1f94edad 100644 --- a/src/toBeSorted/salvage_mgr.cpp +++ b/src/toBeSorted/salvage_mgr.cpp @@ -69,7 +69,7 @@ void dSalvageMgr_c::setupDeliverToActorLink() { if (checkIsOnDeliveryStage2() && field_0x2C > 0) { // TODO wrong registers if (!mDeliverToRef.isLinked() || mDeliverToRef.get()->mProfileName != getDeliverToActorId(mCurrentPickupIdx)) { - dAcObjBase_c *deliverTo = findDeliverToActor(); + dAcObjBase_c *deliverTo = findDeliveryTarget(); if (deliverTo == nullptr) { mDeliverToRef.unlink(); field_0x2C = field_0x2C - 1 < 0 ? 0 : field_0x2C - 1; @@ -86,8 +86,8 @@ void dSalvageMgr_c::setupDeliverToActorLink() { struct SalvageMgrObjTransform { ~SalvageMgrObjTransform() {} - /* 0x00 */ mVec3_c field_0x00; - /* 0x0C */ mAng3_c field_0x0C; + /* 0x00 */ mVec3_c offset; + /* 0x0C */ mAng3_c rotation; }; #define deg_ang(x, y, z) mAng3_c(mAng::fromDeg(x), mAng::fromDeg(y), mAng::fromDeg(z)) @@ -187,8 +187,8 @@ static const SalvageMgrObjEntrypoints sEntrypoints[SALVAGE_OBJ_MAX] = { mMtx_c dSalvageMgr_c::getCarryRotMtx(const s32 &id) const { SalvageMgrObjTransform tf = sTransforms[id]; mMtx_c result; - result.transS(tf.field_0x00); - result.ZYXrotM(tf.field_0x0C); + result.transS(tf.offset); + result.ZYXrotM(tf.rotation); return result; } @@ -223,16 +223,16 @@ bool dSalvageMgr_c::checkIsOnDeliveryStage2() const { return checkIsOnDeliveryStage(); } -bool dSalvageMgr_c::startedQuestForSalvageObj(const dAcSalbageObj_c *obj) const { +bool dSalvageMgr_c::hasStartedQuestForSalvageObj(const dAcSalbageObj_c *obj) const { s32 id = obj->getSalvageIf()->getSalvageObjId(); if (id < 0) { return false; } s32 it = id; - return startedQuestForId(it); + return hasStartedQuestForId(it); } -bool dSalvageMgr_c::startedQuestForId(const s32 &id) const { +bool dSalvageMgr_c::hasStartedQuestForId(const s32 &id) const { if (id == -1) { return false; } else if (sDefs[id].questStartedStoryflag == -1) { @@ -343,7 +343,7 @@ bool dSalvageMgr_c::checkIsOnDeliveryStage() const { } } -dAcObjBase_c *dSalvageMgr_c::findDeliverToActor() { +dAcObjBase_c *dSalvageMgr_c::findDeliveryTarget() { if (mDeliverToRef.isLinked()) { return mDeliverToRef.get(); } else if (mCurrentPickupIdx == -1) {