Merge pull request #92 from OpenVicProject/dataloading-onactions

on_action dataloading

1 files changed, 7 insertions, 0 deletions

diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp
index c23a09b..97b5592 100644
--- a/src/openvic-simulation/dataloader/Dataloader.cpp
+++ b/src/openvic-simulation/dataloader/Dataloader.cpp
@@ -709,6 +709,7 @@ bool Dataloader::load_defines(GameManager& game_manager) const {
 	static constexpr std::string_view event_modifiers_file = "common/event_modifiers.txt";
 	static constexpr std::string_view static_modifiers_file = "common/static_modifiers.txt";
 	static constexpr std::string_view triggered_modifiers_file = "common/triggered_modifiers.txt";
+	static constexpr std::string_view on_actions_file = "common/on_actions.txt";
 
 	bool ret = true;
 
@@ -871,6 +872,12 @@ bool Dataloader::load_defines(GameManager& game_manager) const {
 		Logger::error("Failed to load events!");
 		ret = false;
 	}
+	if (!game_manager.get_event_manager().load_on_action_file(
+		parse_defines(lookup_file(on_actions_file)).get_file_node()
+	)) {
+		Logger::error("Failed to load on actions!");
+		ret = false;
+	}
 
 	return ret;
 }