diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-13 13:42:37 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-13 13:42:37 +0100 |
| commit | f572664cbe1aa5ec2cb6907de3083f058c20af7e (patch) | |
| tree | c9a61c5dd15fb1eae1555f47119423dbba315e76 /src/openvic-simulation/history | |
| parent | ba7bfc52803781c970d6e8afc84c7d3d3e843726 (diff) | |
| parent | ce84886cb931975f622134d6c8d32a69c675d975 (diff) | |
Merge pull request #71 from OpenVicProject/gui-loading
GUI and GFX file loading
Diffstat (limited to 'src/openvic-simulation/history')
| -rw-r--r-- | src/openvic-simulation/history/DiplomaticHistory.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/history/DiplomaticHistory.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/history/DiplomaticHistory.cpp b/src/openvic-simulation/history/DiplomaticHistory.cpp index 6f9d73e..5cbafe7 100644 --- a/src/openvic-simulation/history/DiplomaticHistory.cpp +++ b/src/openvic-simulation/history/DiplomaticHistory.cpp @@ -164,7 +164,7 @@ bool DiplomaticHistoryManager::load_diplomacy_history_file(GameManager& game_man "start_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(start))), "end_date", ONE_EXACTLY, expect_identifier_or_string(expect_date_str(assign_variable_callback(end))) )(node); - + alliances.push_back({ first, second, start, end }); return ret; }, diff --git a/src/openvic-simulation/history/DiplomaticHistory.hpp b/src/openvic-simulation/history/DiplomaticHistory.hpp index 85e2654..64529c2 100644 --- a/src/openvic-simulation/history/DiplomaticHistory.hpp +++ b/src/openvic-simulation/history/DiplomaticHistory.hpp @@ -46,7 +46,7 @@ namespace OpenVic { std::optional<Date> exited; war_participant_t(Country const* new_country, Date new_joined, std::optional<Date> new_exited); - + public: Country const* get_country() const; Date get_date_joined() const; @@ -105,7 +105,7 @@ namespace OpenVic { public: Country const* get_overlord() const; Country const* get_subject() const; - const type_t get_subject_type() const; + const type_t get_subject_type() const; }; struct DiplomaticHistoryManager { |