aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/openvic-simulation/misc')
-rw-r--r--src/openvic-simulation/misc/Define.cpp19
-rw-r--r--src/openvic-simulation/misc/Define.hpp19
2 files changed, 9 insertions, 29 deletions
diff --git a/src/openvic-simulation/misc/Define.cpp b/src/openvic-simulation/misc/Define.cpp
index 3da1f4a..5e6a3cb 100644
--- a/src/openvic-simulation/misc/Define.cpp
+++ b/src/openvic-simulation/misc/Define.cpp
@@ -15,14 +15,8 @@
using namespace OpenVic;
using namespace OpenVic::NodeTools;
-Define::Define(
- std::string_view new_identifier,
- std::string&& new_value,
- Type new_type
-) : HasIdentifier { new_identifier },
- value { std::move(new_value) },
- type { new_type } {
-}
+Define::Define(std::string_view new_identifier, std::string&& new_value, Type new_type)
+ : HasIdentifier { new_identifier }, value { std::move(new_value) }, type { new_type } {}
fixed_point_t Define::get_value_as_fp() const {
return fixed_point_t::parse(value);
@@ -36,8 +30,7 @@ uint64_t Define::get_value_as_uint() const {
return std::strtoull(value.data(), nullptr, 10);
}
-DefineManager::DefineManager() : defines { "defines" } {
-}
+DefineManager::DefineManager() : defines { "defines" } {}
bool DefineManager::add_define(std::string_view name, std::string&& value, Define::Type type) {
return defines.add_item({ name, std::move(value), type }, duplicate_warning_callback);
@@ -70,8 +63,8 @@ bool DefineManager::add_date_define(std::string_view name, Date date) {
bool DefineManager::load_defines_file(ast::NodeCPtr root) {
bool ret = expect_dictionary_keys(
"defines", ONE_EXACTLY, expect_dictionary([this](std::string_view key, ast::NodeCPtr value) -> bool {
- if (key == "country" || key == "economy" || key == "military" || key == "diplomacy"
- || key == "pops" || key == "ai" || key == "graphics") {
+ if (key == "country" || key == "economy" || key == "military" || key == "diplomacy" ||
+ key == "pops" || key == "ai" || key == "graphics") {
return expect_dictionary([this, &key](std::string_view inner_key, ast::NodeCPtr value) -> bool {
std::string str_val;
@@ -122,4 +115,4 @@ bool DefineManager::load_defines_file(ast::NodeCPtr root) {
)(root);
lock_defines();
return ret;
-} \ No newline at end of file
+}
diff --git a/src/openvic-simulation/misc/Define.hpp b/src/openvic-simulation/misc/Define.hpp
index 9b768b7..0db9716 100644
--- a/src/openvic-simulation/misc/Define.hpp
+++ b/src/openvic-simulation/misc/Define.hpp
@@ -12,26 +12,13 @@ namespace OpenVic {
struct Define : HasIdentifier {
friend struct DefineManager;
- enum class Type : unsigned char {
- None,
- Country,
- Economy,
- Military,
- Diplomacy,
- Pops,
- Ai,
- Graphics
- };
+ enum class Type : unsigned char { None, Country, Economy, Military, Diplomacy, Pops, Ai, Graphics };
private:
std::string HASID_PROPERTY(value);
Type HASID_PROPERTY(type);
- Define(
- std::string_view new_identifier,
- std::string&& new_value,
- Type new_type
- );
+ Define(std::string_view new_identifier, std::string&& new_value, Type new_type);
public:
Define(Define&&) = default;
@@ -60,4 +47,4 @@ namespace OpenVic {
bool load_defines_file(ast::NodeCPtr root);
};
-} \ No newline at end of file
+}