Scaffolding for `positions.txt` + modifier loading

2 files changed, 4 insertions, 3 deletions

diff --git a/src/openvic-simulation/types/IdentifierRegistry.hpp b/src/openvic-simulation/types/IdentifierRegistry.hpp
index 3f73a2c..8dabd46 100644
--- a/src/openvic-simulation/types/IdentifierRegistry.hpp
+++ b/src/openvic-simulation/types/IdentifierRegistry.hpp
@@ -171,7 +171,7 @@ namespace OpenVic {
 			return items;
 		}
 
-		NodeTools::node_callback_t expect_item(T const*& ret) const {
+		NodeTools::node_callback_t expect_item_identifier(T const*& ret) const {
 			return NodeTools::expect_identifier(
 				[this, &ret](std::string_view identifier) -> bool {
 					ret = get_item_by_identifier(identifier);
@@ -193,8 +193,8 @@ namespace OpenVic {
 		return plural.size(); } \
 	std::vector<type> const& get_##plural() const { \
 		return plural.get_items(); } \
-	NodeTools::node_callback_t expect_##singular(type const*& ret) const { \
-		return plural.expect_item(ret); }
+	NodeTools::node_callback_t expect_##singular##_identifier(type const*& ret) const { \
+		return plural.expect_item_identifier(ret); }
 
 #define IDENTIFIER_REGISTRY_ACCESSORS(type, name) IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(type, name, name##s)
 }
diff --git a/src/openvic-simulation/types/Vector.hpp b/src/openvic-simulation/types/Vector.hpp
index fdf7d70..66f8d2b 100644
--- a/src/openvic-simulation/types/Vector.hpp
+++ b/src/openvic-simulation/types/Vector.hpp
@@ -27,6 +27,7 @@ namespace OpenVic {
 		constexpr friend vec2_t operator-(vec2_t const& arg);
 		constexpr friend vec2_t operator-(vec2_t const& left, vec2_t const& right);
 		constexpr vec2_t& operator-=(vec2_t const& right);
+
 		constexpr friend std::ostream& operator<<(std::ostream& stream, vec2_t const& value);
 	};