diff options
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 +} |