diff options
author | Hop311 <Hop3114@gmail.com> | 2023-05-01 01:34:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-01 01:34:59 +0200 |
commit | b1e985e0774598b3add22069be50f891e981fd79 (patch) | |
tree | e18e9cb252030e9b40ff91463ed117dd00a65789 /extension/src/openvic2/Types.cpp | |
parent | 1f8545facd248bbf4ea0cd551fea5f7d9b0efdce (diff) | |
parent | 2fec521cc6bbe7b2cda0eef3b830acbfc8b68333 (diff) |
Merge pull request #103 from OpenVic2Project/terrain
Cosmetic terrain + Hashmaps
Diffstat (limited to 'extension/src/openvic2/Types.cpp')
-rw-r--r-- | extension/src/openvic2/Types.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extension/src/openvic2/Types.cpp b/extension/src/openvic2/Types.cpp index 42aa5a4..f51ad7c 100644 --- a/extension/src/openvic2/Types.cpp +++ b/extension/src/openvic2/Types.cpp @@ -1,9 +1,8 @@ -#include "openvic2/Types.hpp" +#include "Types.hpp" #include <cassert> #include <sstream> #include <iomanip> -#include "Types.hpp" using namespace OpenVic2; @@ -16,7 +15,7 @@ std::string const& HasIdentifier::get_identifier() const { } HasColour::HasColour(colour_t const new_colour) : colour(new_colour) { - assert(colour <= MAX_COLOUR && colour != NULL_COLOUR); + assert(colour != NULL_COLOUR && colour <= MAX_COLOUR_RGB); } colour_t HasColour::get_colour() const { return colour; } @@ -29,4 +28,4 @@ std::string OpenVic2::HasColour::colour_to_hex_string(colour_t const colour) { std::string HasColour::colour_to_hex_string() const { return colour_to_hex_string(colour); -}
\ No newline at end of file +} |