Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tr2/objects/harpoon_bolt: fix harpoon test on invalid objects
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Details
Publish a pre-release / Build TR1 (push) Has been skipped
Details
Publish a pre-release / Build TR2 (push) Has been skipped
Details
Publish a pre-release / Create a prerelease (push) Has been skipped
Details

Browse source 
This fixes testing harpoon colliding with invalid objects, such as
sprite pickups.

Resolves #2718.
This commit is contained in:
lahm86 2025-04-08 21:38:31 +01:00
parent 9fab033d89
commit bf54cf9130
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/tr2/game/objects/general/harpoon_bolt.c
View file

@ -62,6 +62,9 @@ static void M_Control(const int16_t item_num)
} }
const ANIM_FRAME *const frame = Item_GetBestFrame(target_item); const ANIM_FRAME *const frame = Item_GetBestFrame(target_item);
if (frame == nullptr) {
continue;
}
const BOUNDS_16 *const bounds = &frame->bounds; const BOUNDS_16 *const bounds = &frame->bounds;
const int32_t cdy = item->pos.y - target_item->pos.y; const int32_t cdy = item->pos.y - target_item->pos.y;