diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-08-30 01:22:08 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-08-30 01:22:08 +0200 |
| commit | 68fca4f504e7f178f69d0dfd64e90ffb1d579322 (patch) | |
| tree | bedfa97590a31eb5f2871b7921e48423d1ddabde /src/openvic-simulation/map/Mapmode.cpp | |
| parent | 5813948cd3ed6432de374664650d68afbff71915 (diff) | |
| parent | 172ad2fcc34b567eab9eca1f907cd99574fa031e (diff) | |
Merge pull request #187 from OpenVicProject/remove-asserts
Remove unnecessary asserts + make `vec2_t(T val)` constructor explicit
Diffstat (limited to 'src/openvic-simulation/map/Mapmode.cpp')
| -rw-r--r-- | src/openvic-simulation/map/Mapmode.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvic-simulation/map/Mapmode.cpp b/src/openvic-simulation/map/Mapmode.cpp index cab67d1..f951a05 100644 --- a/src/openvic-simulation/map/Mapmode.cpp +++ b/src/openvic-simulation/map/Mapmode.cpp @@ -1,7 +1,5 @@ #include "Mapmode.hpp" -#include <cassert> - #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/map/MapDefinition.hpp" #include "openvic-simulation/map/MapInstance.hpp" @@ -13,10 +11,12 @@ using namespace OpenVic; using namespace OpenVic::colour_literals; Mapmode::Mapmode( - std::string_view new_identifier, index_t new_index, colour_func_t new_colour_func -) : HasIdentifier { new_identifier }, HasIndex { new_index }, colour_func { new_colour_func } { - assert(colour_func != nullptr); -} + std::string_view new_identifier, + index_t new_index, + colour_func_t new_colour_func +) : HasIdentifier { new_identifier }, + HasIndex { new_index }, + colour_func { new_colour_func } {} const Mapmode Mapmode::ERROR_MAPMODE { "mapmode_error", 0, [](MapInstance const&, ProvinceInstance const& province) -> base_stripe_t { |