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.

Sign up for GitHub

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

State regions crash #705

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

State regions crash #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1261220
Fix a possible crash when importing state regions.
Idhrendur Feb 8, 2025
cbf0154
Make it an exception instead.
Idhrendur Feb 8, 2025
0e58029
Add test
Idhrendur Feb 8, 2025
da07730
formatting
Idhrendur Feb 8, 2025
b57b028
More logging when reading world.
Idhrendur Feb 16, 2025
58f95cf
Merge remote-tracking branch 'upstream/main' into state_regions_crash
Idhrendur Feb 16, 2025
b784185
Build fixes
Idhrendur Feb 16, 2025
78fcf04
Log from CreateDefaultWorldFramework
Idhrendur Feb 18, 2025
5f86540
Remove some extraneous logging
Idhrendur Feb 18, 2025
64e6350
Fix
Idhrendur Feb 18, 2025
81ba43e
Add even more logging.
Idhrendur Feb 19, 2025
7c99885
More logging in reading regions again.
Idhrendur Feb 21, 2025
18b97e7
Remove async
Idhrendur Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/hoi4_world/world/hoi4_world_converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ void ConvertWars(const std::vector<vic3::War>& source_wars,
hoi4::World hoi4::ConvertWorld(const commonItems::ModFilesystem& hoi4_mod_filesystem,
const vic3::World& source_world,
const mappers::WorldMapper& world_mapper,
std::future<hoi4::WorldFramework> world_framework_future,
hoi4::WorldFramework& world_framework,
const configuration::Configuration& config)
{
Log(LogLevel::Info) << "Creating Hoi4 world";
Expand All @@ -239,7 +239,6 @@ hoi4::World hoi4::ConvertWorld(const commonItems::ModFilesystem& hoi4_mod_filesy

std::map<std::string, vic3::ProvinceType> vic3_significant_provinces =
GatherVic3SignificantProvinces(source_world.GetStateRegions());
hoi4::WorldFramework world_framework = world_framework_future.get();

ProgressManager::SetProgress(50);
Log(LogLevel::Info) << "\tConverting states";
Expand Down
2 changes: 1 addition & 1 deletion src/hoi4_world/world/hoi4_world_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace hoi4
World ConvertWorld(const commonItems::ModFilesystem& hoi4_mod_filesystem,
const vic3::World& source_world,
const mappers::WorldMapper& world_mapper,
std::future<WorldFramework> world_framework_future,
WorldFramework& world_framework_future,
const configuration::Configuration& config = configuration::defaultConfig);

} // namespace hoi4
Expand Down
Loading
Loading