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

Fix sprite statics conflict #2311

Merged
merged 4 commits into from
Jan 17, 2025
Merged

Fix sprite statics conflict #2311

merged 4 commits into from
Jan 17, 2025
+83 −37

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 16, 2025

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
  • I have added a readme entry about my new feature or OG bug fix, or it is a different change

Description

Resolves #2310.

Testing

  • Look for missing static objects
  • Look for missing sprites
  • Check if animated sprites still work (the algae at the bottom of the Tihocan lake)
  • TR1 and TR2

@rr- rr- added TRX bug A bug with TRX OG bug A bug in original game Data Requires injecting content / files that are not a part of the original game TR2 TR1 labels Jan 16, 2025
@rr- rr- self-assigned this Jan 16, 2025
@rr- rr- requested review from a team as code owners January 16, 2025 09:45
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 16, 2025 09:45
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 16, 2025 •
edited
Loading

Download the built assets for this pull request:

lahm86
lahm86 reviewed Jan 16, 2025
View reviewed changes
src/tr1/game/level.c Outdated
LOG_WARNING(
"sprite %d is already loaded "
"(trying to override %d:%d with %d:%d)",
object_id - O_NUMBER_OF, object_id - O_NUMBER_OF,
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think there is an extra object_id - O_NUMBER_OF here

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch – fixed

src/tr2/game/level.c Outdated
LOG_WARNING(
"sprite %d is already loaded "
"(trying to override %d:%d with %d:%d)",
object_id - O_NUMBER_OF, object_id - O_NUMBER_OF,
Copy link
Collaborator

Choose a reason for hiding this comment

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

And here

@rr- rr- force-pushed the issue-2310-sprite-statics-conflict branch from a695de1 to f6b10ed Compare January 16, 2025 12:34
@rr-
Copy link
Collaborator Author

rr- commented Jan 16, 2025

I'll wait for Nickelony's response in TE Discord before merging.

@rr- rr- merged commit 46020df into develop Jan 17, 2025
8 checks passed
@rr- rr- deleted the issue-2310-sprite-statics-conflict branch January 17, 2025 13:20
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
Data Requires injecting content / files that are not a part of the original game OG bug A bug in original game TR1 TR2 TRX bug A bug with TRX
Projects
TRX Dev tracker
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Sprite sequences cause weird meshes to appear
3 participants
@rr- @lahm86 @aredfan