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.

Sign up for GitHub

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

Jump to bottom

Decompile Bartoli #1703

Merged
merged 4 commits into from
Oct 11, 2024
Merged

Decompile Bartoli #1703

merged 4 commits into from
Oct 11, 2024

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Oct 10, 2024

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

#1691

@rr- rr- added the Internal The invisible stuff label Oct 10, 2024
@rr- rr- self-assigned this Oct 10, 2024
@rr- rr- requested review from a team as code owners October 10, 2024 21:10
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team October 10, 2024 21:10
lahm86
lahm86 approved these changes Oct 10, 2024
View reviewed changes
Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

Looks great, just a missing enum usage.

src/tr2/game/objects/creatures/bartoli.c Outdated Show resolved Hide resolved
@aredfan
Copy link
Collaborator

aredfan commented Oct 11, 2024 •
edited by rr-
Loading

I found these issues.

  • The twinkles will stop after a short duration when the dragon is down.

Left is OG, right is PR.

1

  • If the dragon gets up again, fire and explosion sprites will stop being visible. Lara doesn't catch fire.

@rr-
Copy link
Collaborator Author

rr- commented Oct 11, 2024

@aredfan thanks. Can you please check now?

aredfan
aredfan approved these changes Oct 11, 2024
View reviewed changes
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.

@rr- no problem. 👍

I ran another test and both issues are resolved.

@rr- rr- merged commit 17a132a into develop Oct 11, 2024
5 checks passed
@rr- rr- deleted the tr2-decompile branch October 11, 2024 10:00
@rr- rr- added the TR2 label Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aredfan aredfan aredfan approved these changes

@lahm86 lahm86 lahm86 approved these changes

@walkawayy walkawayy Awaiting requested review from walkawayy walkawayy is a code owner automatically assigned from LostArtefacts/dev

Assignees

@rr- rr-

Labels
Internal The invisible stuff TR2
Projects
Roadmap
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rr- @aredfan @lahm86