Merge remote-tracking branch 'upstream/HEAD' into d_a_obj_bomb

1 files changed, 5 insertions, 5 deletions

diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp
index 73232f06..6fef71f6 100644
--- a/src/d/a/d_a_salbage_obj.cpp
+++ b/src/d/a/d_a_salbage_obj.cpp
@@ -97,9 +97,9 @@ int dAcSalbageObj_c::preExecute() {
         }
     }
 
-    getDowsingUnusedF32();
-    field_0x95C.set(0.0f, getDowsingTargetYOffset(), 0.0f);
-    mDowsingTarget.setOffset(field_0x95C);
+    (void)getDowsingUnusedF32();
+    mDowsingOffset.set(0.0f, getDowsingTargetYOffset(), 0.0f);
+    mDowsingTarget.setOffset(mDowsingOffset);
 
     return result;
 }
@@ -312,7 +312,7 @@ void dAcSalbageObj_c::loadBehaviorFromParams() {
 }
 
 void dAcSalbageObj_c::initializeState_Wait() {
-    mDowsingTarget.initialize(getDowsingSlot(), 0, &field_0x95C, getDowsingUnusedF32());
+    mDowsingTarget.initialize(getDowsingSlot(), 0, &mDowsingOffset, getDowsingUnusedF32());
     mDowsingTarget.doRegister();
     mIsDowsingRegistered = true;
 }
@@ -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();
         }
     }