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

Handle loaded MPQ files in a map instead of bespoke globals #7887

Merged
merged 5 commits into from
Apr 7, 2025
Merged

Conversation

AJenbo
Copy link
Member

@AJenbo AJenbo commented Mar 29, 2025

This is done as prep work for being able to load and unload mods that are distributed as MPQ files.

The changes here are done in a way that changes as little as possible about how things works.

  • bespoke bools are still used to track what was loaded
  • Hellfire is always loaded but it's files are skipped if not active
  • priority values match the original Diablo/Hellfire

In a follow up to this PR I would like to:

  • mods are automatically loaded in to the 1xxxx range (the specific value will depend on what order they appear in the ini).
  • 1xxx and 9xxxx stays loaded but changing the mod will reload the 8xxx and 1xxxx range.
  • Hellfire is loaded via a lua function

@AJenbo AJenbo force-pushed the dyn-mpq branch 4 times, most recently from d92a9fe to 883ba88 Compare March 30, 2025 20:09
@AJenbo AJenbo force-pushed the dyn-mpq branch 3 times, most recently from 2efff7c to 29ec30b Compare March 31, 2025 16:57
Co-authored-by: Stephen C. Wills <staphen@gmail.com>
Copy link
Member

@StephenCWills StephenCWills left a comment

Choose a reason for hiding this comment

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

Small note for glebm: Looks like with this change we are checking ASSETS_VERSION on systems with UNPACKED_MPQS where we were not before. So long as the ASSETS_VERSION file gets deployed on those platforms, I don't see this as an issue.

@AJenbo AJenbo merged commit 96112e6 into master Apr 7, 2025
24 checks passed
@AJenbo AJenbo deleted the dyn-mpq branch April 7, 2025 15:17
@AJenbo
Copy link
Member Author

AJenbo commented Apr 7, 2025

Thanks :)

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.

2 participants