aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/history
diff options
context:
space:
mode:
author zaaarf <80046572+zaaarf@users.noreply.github.com>2023-12-01 23:31:41 +0100
committer GitHub <noreply@github.com>2023-12-01 23:31:41 +0100
commit0de3d5849cfb9faad0e3c8ce10a8152a916bba21 (patch)
tree7138640edd95f468115f2732e45c86ae5181d7f7 /src/openvic-simulation/history
parenta54898b7770e0d66b729216173960686c67e58bb (diff)
parent76ddf81044f9ff63e82fc188c0d6aac9616228ce (diff)
Merge pull request #81 from OpenVicProject/dataloading-rebels
Dataloading rebels
Diffstat (limited to 'src/openvic-simulation/history')
-rw-r--r--src/openvic-simulation/history/DiplomaticHistory.hpp8
-rw-r--r--src/openvic-simulation/history/HistoryManager.hpp14
2 files changed, 8 insertions, 14 deletions
diff --git a/src/openvic-simulation/history/DiplomaticHistory.hpp b/src/openvic-simulation/history/DiplomaticHistory.hpp
index 3ed253f..4d620b5 100644
--- a/src/openvic-simulation/history/DiplomaticHistory.hpp
+++ b/src/openvic-simulation/history/DiplomaticHistory.hpp
@@ -19,7 +19,7 @@ namespace OpenVic {
friend struct DiplomaticHistoryManager;
private:
- Date PROPERTY_CUSTOM_NAME(added, get_date_added);
+ Date PROPERTY_CUSTOM_PREFIX(added, get_date);
Country const* PROPERTY(actor);
Country const* PROPERTY(receiver);
WargoalType const* PROPERTY(wargoal);
@@ -34,8 +34,8 @@ namespace OpenVic {
private:
Country const* PROPERTY(country);
- Date PROPERTY_CUSTOM_NAME(joined, get_date_joined);
- std::optional<Date> PROPERTY_CUSTOM_NAME(exited, get_date_exited);
+ Date PROPERTY_CUSTOM_PREFIX(joined, get_date);
+ std::optional<Date> PROPERTY_CUSTOM_PREFIX(exited, get_date);
war_participant_t(Country const* new_country, Date new_joined, std::optional<Date> new_exited);
};
@@ -73,7 +73,7 @@ namespace OpenVic {
private:
Country const* PROPERTY(overlord);
Country const* PROPERTY(subject);
- const type_t PROPERTY_CUSTOM_NAME(type, get_subject_type);
+ const type_t PROPERTY_CUSTOM_PREFIX(type, get_subject);
const Date start;
const Date end;
diff --git a/src/openvic-simulation/history/HistoryManager.hpp b/src/openvic-simulation/history/HistoryManager.hpp
index a7fc668..35aebbf 100644
--- a/src/openvic-simulation/history/HistoryManager.hpp
+++ b/src/openvic-simulation/history/HistoryManager.hpp
@@ -9,15 +9,9 @@
namespace OpenVic {
struct HistoryManager {
private:
- BookmarkManager bookmark_manager;
- CountryHistoryManager country_manager;
- ProvinceHistoryManager province_manager;
- DiplomaticHistoryManager diplomacy_manager;
-
- public:
- REF_GETTERS(bookmark_manager)
- REF_GETTERS(country_manager)
- REF_GETTERS(province_manager)
- REF_GETTERS(diplomacy_manager)
+ BookmarkManager PROPERTY_REF(bookmark_manager);
+ CountryHistoryManager PROPERTY_REF(country_manager);
+ ProvinceHistoryManager PROPERTY_REF(province_manager);
+ DiplomaticHistoryManager PROPERTY_REF(diplomacy_manager);
};
}