Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

creature: perform safer conversion of hybrids #1517

Merged

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Sep 14, 2024

Resolves #1444.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

A check will be performed before switching rats and crocodiles to ensure the target object is loaded. A similar check is done for skate kid's skateboard before trying to draw it.

Tidied up some consts too.

Attached is a couple of test levels, the first has the water models present and the land models not, the second vice-versa. There is a flipmap pad to test. Also, in the first, the skateboard is missing.

hybrids.zip

@lahm86 lahm86 added OG bug A bug in original game Priority: medium labels Sep 14, 2024
@lahm86 lahm86 added this to the 4.4 milestone Sep 14, 2024
@lahm86 lahm86 self-assigned this Sep 14, 2024
@lahm86 lahm86 requested review from a team as code owners September 14, 2024 12:37
@lahm86 lahm86 requested review from rr-, walkawayy and aredfan and removed request for a team September 14, 2024 12:37
Copy link
Collaborator

@aredfan aredfan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tried out the test levels and experienced no crashes. LGTM.

A check will be performed before switching rats and crocodiles to
ensure the target object is loaded. A similar check is done for
skate kid's skateboard before trying to draw it.

Resolves LostArtefacts#1444.
@lahm86 lahm86 force-pushed the issue-1444-safer-creature-conversion branch from 7c6e86f to 15df81e Compare September 14, 2024 19:05
@lahm86 lahm86 merged commit 3304c98 into LostArtefacts:develop Sep 14, 2024
5 checks passed
@lahm86 lahm86 deleted the issue-1444-safer-creature-conversion branch September 14, 2024 19:07
@rr- rr- added the TR1 label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OG bug A bug in original game TR1
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Missing rat and crocodile models can cause a crash
4 participants