Skip to content

Conversation

ShnitzelX2
Copy link
Contributor

Summary

None

Purpose of change

Describe the solution

See title; the base settings have to be merged before mod settings are merged.

This PR pulls from commit 237224e to avoid a loading failure. building_bin::unfinalized_buildings is unused for region_settings_new, so it would be empty when loading and cause an error.

This PR also pulls from commit 09d8219 to move the region settings file deeper so that objects it uses are loaded first.

Describe alternatives you've considered

Testing

Loaded game without error, worked in #82631. CI should be fine, but double-check

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 18, 2025
@GuardianDll
Copy link
Member

Mods-([slow] ~starting_items)=> ../tests/overmap_test.cpp:521: FAILED:
Mods-([slow] ~starting_items)=> explicitly with messages:
Mods-([slow] ~starting_items)=>   id := int_id( "hw_reserved" )
Mods-([slow] ~starting_items)=>   oter_type_id was found in map but had SHOULD_NOT_SPAWN flag

@ShnitzelX2
Copy link
Contributor Author

This test failure is older, from the highways PR, and I still can't figure out why it's happening. I haven't seen a single instance of reserved OMTs in-game, so it may be test-only.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 19, 2025
@Maleclypse Maleclypse merged commit 0480888 into CleverRaven:master Sep 20, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants