diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2025-03-30 21:34:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-30 21:34:05 -0400 |
| commit | e85a989271d9445d4c4e1da41dfb6d90cb0652aa (patch) | |
| tree | 595f51b5c210a9c65bed82611e02be5e6026f934 /src/d | |
| parent | 4a17d86c3b3972506481b33ff3d3e2c96f31f541 (diff) | |
Chair (#143)
* chair
* mostly done
* updateChairPos match
---------
Co-authored-by: robojumper <robojumper@gmail.com>
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/a/obj/d_a_obj_arrow.cpp | 4 | ||||
| -rw-r--r-- | src/d/a/obj/d_a_obj_tbox.cpp | 2 | ||||
| -rw-r--r-- | src/d/col/bg/d_bg_s.cpp | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/d/a/obj/d_a_obj_arrow.cpp b/src/d/a/obj/d_a_obj_arrow.cpp index b44643e6..d600ecb2 100644 --- a/src/d/a/obj/d_a_obj_arrow.cpp +++ b/src/d/a/obj/d_a_obj_arrow.cpp @@ -20,7 +20,7 @@ cCcD_SrcGObj dAcArrow_c::sCcSrcInf = { {AT_TYPE_ARROW, 0x8BB, {0x15,0, 0}, 0, 0, 0, 0, 0, 0}, { ~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_ARROW | AT_TYPE_0x100 | AT_TYPE_WIND | AT_TYPE_SLINGSHOT), - 0x210, 0, 0x407, 0, 0 + 0x210, {0, 0, 0x407}, 0, 0 }, {0}, }; @@ -32,7 +32,7 @@ dCcD_SrcCps dAcArrow_c::sCc1 = { const dCcD_SrcSph dAcArrow_c::sCc2 = { {{0x0, 0x0, 0x0, 0, 0, 0, 0, 0, 0}, - {AT_TYPE_SWORD, 0x211, 0, 0x407, 0, 0}, + {AT_TYPE_SWORD, 0x211, {0, 0, 0x407}, 0, 0}, {0xC28}}, {100.0f}, }; diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp index 8a7650ec..b85de5cd 100644 --- a/src/d/a/obj/d_a_obj_tbox.cpp +++ b/src/d/a/obj/d_a_obj_tbox.cpp @@ -89,7 +89,7 @@ static char *const sOpenEventNames[] = { // TODO just copied from somewhere const cCcD_SrcGObj dAcTbox_c::sColSrc = { /* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, - /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0, {0, 0x407}, 0, 0}, + /* mObjTg */ {~(AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND), 0, {0, 0, 0x407}, 0, 0}, /* mObjCo */ {0xE9} }; // clang-format on diff --git a/src/d/col/bg/d_bg_s.cpp b/src/d/col/bg/d_bg_s.cpp index ecd352ef..d3067b25 100644 --- a/src/d/col/bg/d_bg_s.cpp +++ b/src/d/col/bg/d_bg_s.cpp @@ -498,7 +498,6 @@ bool dBgS::UnRegist(dBgW_Base *pBg) { return false; } - // Not Quite Right if (id <= (BG_ID_MAX - 1) && mColllisionTbl[id] != nullptr) { mColllisionTbl[id] = nullptr; pBg->UnRegistBg(); @@ -513,12 +512,11 @@ bool dBgS::UnRegist(dBgW_Base *pBg) { } } } - ret = false; } else { - ret = true; + return true; } - return ret; + return false; } bool dBgS::ChkMoveBG(cBgS_PolyInfo const &info, bool bChkLock) { @@ -1004,7 +1002,8 @@ mVec3_c dBgS_GetN(cBgS_PolyInfo const &info) { } void dBgS::UpdateScrollTex() { - MapSrollText_t *scrollTex = (MapSrollText_t *)OarcManager::GetInstance()->getData(common_folder, MAP_SCROLL_TEX_FILE); + MapSrollText_t *scrollTex = + (MapSrollText_t *)OarcManager::GetInstance()->getData(common_folder, MAP_SCROLL_TEX_FILE); for (int i = 0; i < 5; ++i, ++scrollTex) { if (++mField_0x3864[i] >= scrollTex->mField_0x0E) { mField_0x3864[i] = 0; |