diff options
author | Spartan322 <Megacake1234@gmail.com> | 2024-01-05 02:48:46 +0100 |
---|---|---|
committer | Spartan322 <Megacake1234@gmail.com> | 2024-01-18 07:34:43 +0100 |
commit | 3f9911dd1cbfca513c8615d778a8295906d8b7d5 (patch) | |
tree | 0ec60f4eea8c5fe15eebffc6f92dda1defd5ba6f /src/openvic-simulation/dataloader | |
parent | b5783116f67c9f7aa9d8d9653e6bda0227f67cd2 (diff) |
Add skeleton CountryRelationManager
Change `DiplomaticAction::Argument` to refer to `CountryInstance*` instead of `Country*`
Add `GameManager&` argument to `DiplomaticActionManager::setup_diplomatic_actions`
Add some ErrorMacros, likely and unlikely macros and stringization macros (based on Godot's macros)
Implement `increase_relations` DiplomaticAction commit function
Implement `decrease_relations` DiplomaticAction commit function
Fix include StringUtils.hpp errors
Diffstat (limited to 'src/openvic-simulation/dataloader')
-rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 0078ed2..a3d00cc 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -946,7 +946,7 @@ bool Dataloader::load_defines(GameManager& game_manager) { Logger::error("Failed to load on actions!"); ret = false; } - if (!game_manager.get_diplomacy_manager().get_diplomatic_action_manager().setup_diplomatic_actions()) { + if (!game_manager.get_diplomacy_manager().get_diplomatic_action_manager().setup_diplomatic_actions(game_manager)) { Logger::error("Failed to load diplomatic actions!"); ret = false; } |