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

Fix: add header to align soh.otr file assets and fix asset crash for Mac #2819

Merged

Conversation

Archez
Copy link
Contributor

@Archez Archez commented May 2, 2023

For some reason on mac release builds, our custom assets in the soh.otr file 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.h header 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

Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

Resolved the issues plaguing my dev environment.

@briaguya-ai
Copy link
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.

Copy link
Contributor

@leggettc18 leggettc18 left a comment

Choose a reason for hiding this comment

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

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.

@Archez
Copy link
Contributor Author

Archez commented May 4, 2023

@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.

Correct, no crashing in LUS from what I could see (creating release builds locally). Since those are loaded in ImGui rather than Fast3D.

@leggettc18 leggettc18 merged commit c3c97f2 into HarbourMasters:develop-spock May 4, 2023
7 checks passed
@Archez Archez deleted the fix-mac-soh-asset-usage branch May 4, 2023 01:32
@Archez Archez mentioned this pull request May 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants