diff options
| 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 |
| commit | 0de3d5849cfb9faad0e3c8ce10a8152a916bba21 (patch) | |
| tree | 7138640edd95f468115f2732e45c86ae5181d7f7 /src/openvic-simulation/military/Unit.hpp | |
| parent | a54898b7770e0d66b729216173960686c67e58bb (diff) | |
| parent | 76ddf81044f9ff63e82fc188c0d6aac9616228ce (diff) | |
Merge pull request #81 from OpenVicProject/dataloading-rebels
Dataloading rebels
Diffstat (limited to 'src/openvic-simulation/military/Unit.hpp')
| -rw-r--r-- | src/openvic-simulation/military/Unit.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/openvic-simulation/military/Unit.hpp b/src/openvic-simulation/military/Unit.hpp index 632067e..65d0936 100644 --- a/src/openvic-simulation/military/Unit.hpp +++ b/src/openvic-simulation/military/Unit.hpp @@ -35,9 +35,9 @@ namespace OpenVic { const type_t PROPERTY(type); const icon_t PROPERTY(icon); const std::string PROPERTY(sprite); - const bool PROPERTY_CUSTOM_NAME(active, is_active); + const bool PROPERTY_CUSTOM_PREFIX(active, is); const std::string PROPERTY(unit_type); - const bool PROPERTY_CUSTOM_NAME(floating_flag, has_floating_flag); + const bool PROPERTY_CUSTOM_PREFIX(floating_flag, has); const uint32_t PROPERTY(priority); const fixed_point_t PROPERTY(max_strength); @@ -64,7 +64,7 @@ namespace OpenVic { friend struct UnitManager; private: - const bool PROPERTY_CUSTOM_NAME(primary_culture, is_primary_culture); + const bool PROPERTY_CUSTOM_PREFIX(primary_culture, is); const std::string PROPERTY(sprite_override); const std::string PROPERTY(sprite_mount); const std::string PROPERTY(sprite_mount_attach_node); @@ -87,11 +87,11 @@ namespace OpenVic { private: const icon_t PROPERTY(naval_icon); - const bool PROPERTY_CUSTOM_NAME(sail, can_sail); - const bool PROPERTY_CUSTOM_NAME(transport, is_transport); - const bool PROPERTY_CUSTOM_NAME(capital, is_capital); + const bool PROPERTY_CUSTOM_PREFIX(sail, can); + const bool PROPERTY_CUSTOM_PREFIX(transport, is); + const bool PROPERTY_CUSTOM_PREFIX(capital, is); const fixed_point_t PROPERTY(colonial_points); - const bool PROPERTY_CUSTOM_NAME(build_overseas, can_build_overseas); + const bool PROPERTY_CUSTOM_PREFIX(build_overseas, can); const uint32_t PROPERTY(min_port_level); const int32_t PROPERTY(limit_per_port); const fixed_point_t PROPERTY(supply_consumption_score); |