diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2026-05-28 14:32:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-28 14:32:52 -0400 |
| commit | 83f216dd37e56efddd1d19351836f3b03f074058 (patch) | |
| tree | 8da270877638838dd70054bf5cd5eadac74bc934 /src/d/a/d_a_item.cpp | |
| parent | 45374694e7e33db110983312c3e2525a6993dc76 (diff) | |
| parent | 1b61a62a004ceb93a60eb4192ccbb6b601494d5c (diff) | |
Merge pull request #312 from elijah-thomas774/d_a_e_ks
dAcEKs_c
Diffstat (limited to 'src/d/a/d_a_item.cpp')
| -rw-r--r-- | src/d/a/d_a_item.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/d/a/d_a_item.cpp b/src/d/a/d_a_item.cpp index 1452dd69..3de0f79f 100644 --- a/src/d/a/d_a_item.cpp +++ b/src/d/a/d_a_item.cpp @@ -445,15 +445,13 @@ extern const UnkFloat f2(1.0f); SPECIAL_ACTOR_PROFILE(ITEM, dAcItem_c, fProfile::ITEM, 0x2B, 0, 2); const dAcItem_c::sStaticPtmf dAcItem_c::sStaticPtmfs1[] = { - &dAcItem_c::fn_80248020, nullptr, - &dAcItem_c::fn_80248010, nullptr, - &dAcItem_c::fn_80255B30, &dAcItem_c::fn_80255BA0, + &dAcItem_c::fn_80248020, nullptr, &dAcItem_c::fn_80248010, nullptr, &dAcItem_c::fn_80255B30, + &dAcItem_c::fn_80255BA0, }; const dAcItem_c::sStaticPtmf dAcItem_c::sStaticPtmfs2[] = { - &dAcItem_c::fn_80248040, nullptr, - &dAcItem_c::fn_80248030, nullptr, - &dAcItem_c::fn_80255BD0, &dAcItem_c::fn_80255C40, + &dAcItem_c::fn_80248040, nullptr, &dAcItem_c::fn_80248030, nullptr, &dAcItem_c::fn_80255BD0, + &dAcItem_c::fn_80255C40, }; fLiMgBa_c dAcItem_c::sItemList; @@ -1429,7 +1427,7 @@ void dAcItem_c::executeState_Wait() { if (fn_802574A0() && !tgBit1) { // TODO weird double load of link link = dAcPy_c::GetLinkM(); - if (!link->vt_0x1C0()) { + if (!link->getBeetleInFlight()) { addToGetQueue(); if ((link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() && @@ -1752,7 +1750,7 @@ void dAcItem_c::executeState_Carry() { if (fn_802574A0()) { // TODO weird double load dAcPy_c *link = dAcPy_c::GetLinkM(); - if (!link->vt_0x1C0()) { + if (!link->getBeetleInFlight()) { addToGetQueue(); if (link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() && FileManager::sInstance->getCurrentHealth() != 0) { @@ -1816,7 +1814,7 @@ void dAcItem_c::executeState_GetBeetle() { if (link == nullptr) { return; } - dAcBoomerang_c *beetlePtr = (dAcBoomerang_c *)link->vt_0x1C0(); + dAcBoomerang_c *beetlePtr = (dAcBoomerang_c *)link->getBeetleInFlight(); if (beetlePtr == nullptr) { if (link->ifHasHealthAndSomethingElse() && this == sItemListHead.get() && FileManager::sInstance->getCurrentHealth() != 0) { |