diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-06-13 00:52:45 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-06-13 00:52:45 +0200 |
| commit | a49e4d0975e2b5dfd13ae50aa716f1a0307e618d (patch) | |
| tree | f681dd2e76d489ba6e7beea44ae6ebd59e9d51f3 /src/openvic-simulation/military/Deployment.cpp | |
| parent | f5d173e88a49a1a9556860063aef1aa287925cfd (diff) | |
| parent | 1198a780916e65cae048dd3478f614c1d18db846 (diff) | |
Merge pull request #162 from OpenVicProject/map-instance
Map instance
Diffstat (limited to 'src/openvic-simulation/military/Deployment.cpp')
| -rw-r--r-- | src/openvic-simulation/military/Deployment.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/military/Deployment.cpp b/src/openvic-simulation/military/Deployment.cpp index 4550108..813cd94 100644 --- a/src/openvic-simulation/military/Deployment.cpp +++ b/src/openvic-simulation/military/Deployment.cpp @@ -126,7 +126,7 @@ bool DeploymentManager::load_oob_file( const bool ret = expect_dictionary_keys( "name", ONE_EXACTLY, expect_string(assign_variable_callback(army_name)), - "location", ONE_EXACTLY, game_manager.get_map().expect_province_definition_identifier( + "location", ONE_EXACTLY, game_manager.get_map_definition().expect_province_definition_identifier( assign_variable_callback_pointer(army_location) ), "regiment", ONE_OR_MORE, [&game_manager, &army_regiments](ast::NodeCPtr node) -> bool { @@ -138,7 +138,7 @@ bool DeploymentManager::load_oob_file( "name", ONE_EXACTLY, expect_string(assign_variable_callback(regiment_name)), "type", ONE_EXACTLY, game_manager.get_military_manager().get_unit_type_manager() .expect_regiment_type_identifier(assign_variable_callback_pointer(regiment_type)), - "home", ZERO_OR_ONE, game_manager.get_map() + "home", ZERO_OR_ONE, game_manager.get_map_definition() .expect_province_definition_identifier(assign_variable_callback_pointer(regiment_home)) )(node); @@ -170,7 +170,7 @@ bool DeploymentManager::load_oob_file( const bool ret = expect_dictionary_keys( "name", ONE_EXACTLY, expect_string(assign_variable_callback(navy_name)), - "location", ONE_EXACTLY, game_manager.get_map().expect_province_definition_identifier( + "location", ONE_EXACTLY, game_manager.get_map_definition().expect_province_definition_identifier( assign_variable_callback_pointer(navy_location) ), "ship", ONE_OR_MORE, [&game_manager, &navy_ships](ast::NodeCPtr node) -> bool { |