d_linkage is largely done (#176)

src/d/a/obj/d_a_obj_arrow.cpp

@@ -1,7 +1,6 @@
 #include "d/a/obj/d_a_obj_arrow.h"
 
 #include "c/c_math.h"
-#include "d/a/d_a_player.h"
 #include "d/col/c/c_cc_d.h"
 #include "nw4r/types_nw4r.h"
 
@@ -38,7 +37,7 @@ const dCcD_SrcSph dAcArrow_c::sCc2 = {
 
 // clang-format on
 
-bool hitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
+bool dAcArrow_atHitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
     static_cast<dAcArrow_c *>(i_actorA)->hitCallback(i_objInfA, i_actorB, i_objInfB);
     return true;
 }
@@ -70,7 +69,7 @@ int dAcArrow_c::create() {
     mCcCps.Set(sCc1);
     mCcCps.SetStts(mStts);
     mCcCps.SetAtFlag(0x2000);
-    mCcCps.SetAtCallback(::hitCallback);
+    mCcCps.SetAtCallback(dAcArrow_atHitCallback);
     mCcSph.Set(sCc2);
     mCcSph.SetStts(mStts);
 

src/d/a/obj/d_a_obj_boomerang.cpp

@@ -0,0 +1,95 @@
+#include "d/a/obj/d_a_obj_boomerang.h"
+
+#include "common.h"
+#include "d/a/d_a_player.h"
+#include "d/a/obj/d_a_obj_base.h"
+#include "f/f_profile_name.h"
+#include "m/m3d/m_fanm.h"
+#include "nw4r/g3d/g3d_anmchr.h"
+#include "nw4r/g3d/res/g3d_resmdl.h"
+#include "s/s_State.hpp"
+
+SPECIAL_ACTOR_PROFILE(BOOMERANG, dAcBoomerang_c, fProfile::BOOMERANG, 0x125, 0, 0x4);
+
+STATE_DEFINE(dAcBoomerang_c, Wait);
+STATE_DEFINE(dAcBoomerang_c, Move);
+STATE_DEFINE(dAcBoomerang_c, MoveCancelWait);
+STATE_DEFINE(dAcBoomerang_c, ReturnWait);
+STATE_DEFINE(dAcBoomerang_c, EventReturnWait);
+
+const dAcBoomerang_c::ChrAnimation_t dAcBoomerang_c::sChrAnims[dAcBoomerang_c::RB_MAX] = {
+    {    "RB_Set", 0.f},
+    {"RB_Default", 3.f},
+    {    "RB_Cut", 3.f},
+    {   "RB_Hold", 3.f},
+    {"RB_Hold_ed", 3.f},
+    {   "RB_Back", 3.f},
+};
+
+void areaCallback(dAcObjBase_c *param0, mVec3_c *param1, u32 param2) {
+    if (param2 != 0) {
+        return;
+    }
+}
+
+void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
+    if (i_actorB != nullptr && GetLinkage().checkFlag(0x80)) {
+        if (dAcPy_c::getCurrentBeetleType() > 2) {
+            if (i_actorB == mGrabbedActor.get()) {
+                return;
+            }
+
+            if (!mStateMgr.isState(StateID_Move)) {
+                return;
+            }
+
+            if (tryGrabObject(i_actorB)) {
+                setChrAnimation(RB_HOLD);
+                mAnmChr[0].setRate(0.f);
+                mAnmChr[0].setFrameOnly(i_actorB->GetLinkage().field_0x24);
+            }
+        }
+    }
+}
+
+bool dAcBoomerang_atHitCallback(
+    dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB
+) {
+    static_cast<dAcBoomerang_c *>(i_actorA)->atHitCallback(i_objInfA, i_actorB, i_objInfB);
+    return true;
+}
+
+// ...
+
+bool dAcBoomerang_c::tryGrabObject(dAcObjBase_c *pObj) {
+    dAcPy_c *player = dAcPy_c::GetLink2();
+    if (checkField_0x8CC(0x1000) && GetLinkage().checkFlag(0x80)) {}
+}
+
+// ...
+
+void dAcBoomerang_c::setChrAnimation(dAcBoomerang_c::ChrAnimation_e requestedAnimation) {
+    // Do not set anim if there is no change, or the request is to cut from hold
+    if (requestedAnimation == mCurrentAnimation || (mCurrentAnimation == RB_HOLD && requestedAnimation == RB_CUT)) {
+        return;
+    }
+
+    mAnmChr[0].setAnm(mMdl, mResFile.GetResAnmChr(sChrAnims[requestedAnimation].mName), m3d::PLAY_MODE_4);
+    nw4r::g3d::AnmObjChr *pAnmObj = static_cast<nw4r::g3d::AnmObjChr *>(mAnmChr[0].getAnimObj());
+
+    pAnmObj->Release();
+
+    nw4r::g3d::ResMdl mdl = mMdl.getResMdl();
+    for (int i = 0; i < mWindNodeID; ++i) {
+        pAnmObj->Bind(mdl, i, nw4r::g3d::AnmObjChr::BIND_ONE);
+    }
+
+    if (requestedAnimation == RB_SET) {
+        pAnmObj->Bind(mdl, mLeftWingNodeID, nw4r::g3d::AnmObjChr::BIND_ONE);
+        pAnmObj->Bind(mdl, mRightWingNodeID, nw4r::g3d::AnmObjChr::BIND_ONE);
+    }
+
+    mCurrentAnimation = requestedAnimation;
+
+    mMdl.setAnm(mAnmChrBlend, sChrAnims[requestedAnimation].mRate);
+}

src/d/a/obj/d_a_obj_switch.cpp

@@ -3,6 +3,7 @@
 #include "d/a/d_a_player.h"
 #include "d/col/bg/d_bg_s.h"
 #include "d/col/bg/d_bg_w.h"
+#include "d/d_linkage.h"
 #include "d/flag/sceneflag_manager.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_Math.h"
@@ -42,26 +43,29 @@ void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *in
     dAcPy_c *link = interactor->isActorPlayer() ? static_cast<dAcPy_c *>(interactor) : nullptr;
     dAcOsw_c *sw = static_cast<dAcOsw_c *>(actor);
 
-    // halp
-    if (!(link == nullptr || (!link->checkActionFlags(dAcPy_c::FLG0_IN_WATER) &&
-                              ((!link->checkFlags0x340(0x800000) ||
-                                ((link->getCurrentCarriedActor() != nullptr &&
-                                  link->getCurrentCarriedActor()->mActorCarryInfo.testCarryFlag(0x04)))))))) {
+    if (link != nullptr) {
+        if (link->checkActionFlags(dAcPy_c::FLG0_IN_WATER)) {
+            return;
+        }
+        if (link->checkFlags0x340(0x800000) &&
+            !(link->getCurrentCarriedActor() && link->getCurrentCarriedActor()->GetLinkage().checkFlag(0x04))) {
+            return;
+        }
+    }
+
+    if (interactor->GetLinkage().checkState(dLinkage_c::STATE_ACTIVE)) {
         return;
     }
-    if (interactor->mActorCarryInfo.isCarried != 1) {
-        if (link == nullptr || (link->checkActionFlags(0xC70852)) == 0) {
-            if (!sw->someInteractCheck(link != nullptr)) {
-                bool needsOnFlag = sw->mOnSceneFlag < 0xFF &&
-                                   !SceneflagManager::sInstance->checkBoolFlag(sw->roomid, sw->mOnSceneFlag);
-                if (!needsOnFlag && sw->mObjRef.get() == nullptr && link != nullptr && sw->field_0x5F1 == 0 &&
-                    sw->mStateMgr.isState(StateID_On)) {
-                    link->onFlags_0x360(0x8000);
-                }
+
+    if (!(link && link->checkActionFlags(0xC70852))) {
+        if (!sw->someInteractCheck(link != nullptr)) {
+            if (!sw->checkOnFlag() && sw->mObjRef.get() == nullptr && link != nullptr && sw->field_0x5F1 == 0 &&
+                sw->mStateMgr.isState(StateID_On)) {
+                link->onFlags_0x360(0x8000);
             }
         }
-        interactor->setObjectProperty(0x40);
     }
+    interactor->setObjectProperty(0x40);
 }
 
 bool dAcOsw_c::createHeap() {