libtrx/config: refactor enforced config approach #1858
Conversation
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
|
What if we try to set the enforced config options in the gameflow file instead? Probably a tough cookie, as we read that file much later. Maybe a separate file such as TR1X-lock.json (or less clumsy naming)? That way the files are free to be shipped and override existing installations, which removes the burden of maintaining backwards compatibility with existing user setups. |
|
Ok, I think it's doable and I think it will be nicer in the long-run. If it wasn't for the UB snag we'd be home and dry pretty much 😄 No need to test just yet @walkawayy, @aredfan - I'll let you know when it's updated and ready. |
lahm86
force-pushed
the
issue-1857-remove-gf-forced-vars
branch
3 times, most recently
from
f5c22f4 to
698f32a
Compare
lahm86
changed the title
|
Ok, we should be good for testing this now. The gameflow now accepts the The config tool will continue to show where settings are enforced, as it also reads both files now. |
src/libtrx/config/file.c
Outdated
| @@ -165,6 +193,9 @@ bool ConfigFile_Write(const char *path, void (*dump)(JSON_OBJECT *root_obj)) | |||
| if (old_data != NULL) { | |||
| Memory_FreePointer(&old_data); | |||
| } | |||
| if (enforced_data != NULL) { | |||
| Memory_FreePointer(&enforced_data); | |||
| } | |||
There was a problem hiding this comment.
Memory_Free family already checks for nulls so no need for this double safety.
This refactors the enforced config control from LostArtefacts#1854 into the gameflow and removes the legacy settings for enforcing game modes and save crystals. Resolves LostArtefacts#1857.
lahm86
force-pushed
the
issue-1857-remove-gf-forced-vars
branch
from
698f32a to
641e00d
Compare
Resolves #1857.
Checklist
Description
This removes the dedicated enforced game modes and save crystals settings from the gameflow files, as these can now be controlled by builders in the main config file. The only exception is the UB gameflow, as we need to continue enforcing save crystals to be disabled there, and this can't be done through the config file. As a result, backwards compatibility is in place as standard with this, while the documentation points to the correct procedure for enforcing settings.LMK if you think we can remove backwards compatibility forforce_game_modes, I'm inclined to perhaps leave it for a while.This refactors the enforced config control from #1854 into the gameflow and removes the legacy settings for enforcing game modes and save crystals.