Refactor package loading, get rid of 'core' non-mod and per-world mod folders #2233
Conversation
This file contains 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
github-actions
bot
added
JSON
I actually tried to use it not long ago. Turns out, it's also broken. |
Coolthulhu
reviewed
Dec 12, 2022
| @@ -369,11 +369,11 @@ void dependency_tree::clear() | |||
| master_node_map.clear(); | |||
| } | |||
|
|
|||
| dependency_node *dependency_tree::get_node( mod_id key ) | |||
| dependency_node *dependency_tree::get_node( mod_id key ) const | |||
There was a problem hiding this comment.
Why const if it casts the constness away?
Maybe it should have a const and a non-const variant.
If it's a simple hack to get the job done faster, a comment above it would be nice.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
SUMMARY: Infrastructure "Refactored package loading, got rid of 'core' non-mod and per-world mod folders"
Purpose of change
Streamline package loading, get rid of unused features.
The idea is to transfer from open-ended data loading scheme (initialize loader -> add some packs to it -> either add more packs on top or finalize) to loading from a known set of data packs (pass full list of packs to function -> it initializes loader, adds packs from list, finalizes data).
Along the way, got rid of
corenon-mod. It's a bit of an outlier, being a non-mod data loading location, and has already caused problems in #2106. Original intent with it was to support total conversion mods (CleverRaven/Cataclysm-DDA#19260), but we still have a lot of definitions inbnpack referred from hardcode, so even if someone were to make a totlal conversion mod for Bright Nights they still would have to copy over parts ofbnpack, so existence ofcoredoesn't make any improvement.Also got rid of per-world mods. It's an obscure feature that's not available (or even indicated) in UI in any way, so almost noone knows about it, and its roots come from some 9 years old spaghetti code, so I'm not sure what its original intended purpose even was (bundling mods with saves? earlier iteration of mod manager, before support for multiple worlds?).
Describe the solution
Cherry-picked from #2216.
Removed all code that used to control DynamicDataLoader's pack loading, and either rewrote it to load data directly (in case of main menu's tips) or encapsulated it in functions in
init.h(.cpp).Testing
Game loads without errors.
--check-modsstill works.