Fix: add header to align soh.otr file assets and fix asset crash for Mac#2819
Merged
leggettc18 merged 3 commits intoHarbourMasters:develop-spockfrom May 4, 2023
Merged
Conversation
garrettjoecox
approved these changes
May 3, 2023
Contributor
garrettjoecox
left a comment
There was a problem hiding this comment.
Resolved the issues plaguing my dev environment.
Contributor
|
@Archez if i'm understanding this correctly this means the LUS stuff isn't causing crashes? if that's the case we should get this in. |
leggettc18
approved these changes
May 4, 2023
Contributor
leggettc18
left a comment
There was a problem hiding this comment.
Seems reasonable and doesn't seem to cause any problems on Windows that I can see. Went around to places in the game where some of the affected textures appear and they all seem to work just fine still.
Contributor
Author
Correct, no crashing in LUS from what I could see (creating release builds locally). Since those are loaded in ImGui rather than Fast3D. |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For some reason on mac release builds, our custom assets in the
soh.otrfile were causing crashes when read. An Investigation was done here #2766 and showed that by aligning the custom asset names similar to the original game asset headers, the issue would go away.I've created an
soh_assets.hheader file that contains exports for aligned assets that needed to be fixed to prevent crashing on mac. This file will need to be maintained in the future as we add new assets.Also updated other references to stringed assets like the MQ title sub title and greg green rupee for item tracker to use the aligned vars.
Not included in this PR is assets used by LUS directly, e.g. the input viewer button icons. Not sure if this is the same problem, but I found the input viewer just doesn't display anything for Mac. If a similar solution works for that, it would need to be applied in LUS directly.
Should fix #2766
Build Artifacts