diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-03-05 16:52:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-05 16:52:14 -0700 |
| commit | 376087be692801e8e2c7fd145fbfdfd720cdea16 (patch) | |
| tree | 27447311c1e5cd7a18dcee4157a218671eebb0ed /src/actors | |
| parent | 000c47e6100770a634fa01a1457c28ca8e2b860e (diff) | |
Fix Thwomp Collision and Better Interp Tagging for Actors (#665)
* Update actors.c
* Update actors.c
* actor
* Fix bounding box
* More interp fix
* Update KoopaTroopaBeach.cpp
* Update Thwomp.cpp
* Update actors.c
* Update render.inc.c
* Update render.inc.c
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/fake_item_box/render.inc.c | 3 | ||||
| -rw-r--r-- | src/actors/item_box/render.inc.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/actors/fake_item_box/render.inc.c b/src/actors/fake_item_box/render.inc.c index f00c6eec3..176a2eba3 100644 --- a/src/actors/fake_item_box/render.inc.c +++ b/src/actors/fake_item_box/render.inc.c @@ -25,8 +25,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox) f32 temp_f2_2; f32 someMultiplier; - // @port: Tag the transform. - FrameInterpolation_RecordOpenChild("Fake Item Box", TAG_ITEM_ADDR(fakeItemBox)); + FrameInterpolation_RecordOpenChild("Fake Item Box", TAG_ITEM_ADDR((((struct Actor*)fakeItemBox) - gActorList) << 5) || (camera - cameras)); if (is_within_render_distance(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, camera->fieldOfView, 1000000.0f) < 0 && diff --git a/src/actors/item_box/render.inc.c b/src/actors/item_box/render.inc.c index fde22342a..4acc72abe 100644 --- a/src/actors/item_box/render.inc.c +++ b/src/actors/item_box/render.inc.c @@ -27,8 +27,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) { f32 temp_f2_2; f32 someMultiplier; - // @port: Tag the transform. - FrameInterpolation_RecordOpenChild("ItemBox", TAG_ITEM_ADDR(item_box)); + FrameInterpolation_RecordOpenChild("itembox", TAG_ITEM_ADDR((((struct Actor*)item_box) - gActorList) << 5) || (camera - cameras)); temp_f0 = is_within_render_distance(camera->pos, item_box->pos, camera->rot[1], 0.0f, camera->fieldOfView, 4000000.0f); |