From 1fb1aa2ce36403feeb371404d599e4d0d9666181 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Tue, 21 Jan 2025 19:33:49 -0600 Subject: [PATCH] add back the extra colours --- src/gfx/render_shapes.cpp | 10 +++++++++- src/gfx/render_shapes.hpp | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/gfx/render_shapes.cpp b/src/gfx/render_shapes.cpp index 7b231dae..efaf5584 100644 --- a/src/gfx/render_shapes.cpp +++ b/src/gfx/render_shapes.cpp @@ -36,7 +36,15 @@ std::map colour_map = { {"dark_blue", Colours::DARK_BLUE}, {"dark-green", Colours::DARK_GREEN}, {"light-green", Colours::LIGHT_GREEN}, - {"dark-red", Colours::DARK_RED} + {"dark-red", Colours::DARK_RED}, + // Extra Colors + {"lime", Colours::LIME}, + {"aqua", Colours::AQUA}, + {"fuchsia", Colours::FUCHSIA}, + {"maroon", Colours::MAROON}, + {"olive", Colours::OLIVE}, + {"purple", Colours::PURPLE}, + {"silvel", Colours::SILVER} }; // TODO: Put these classes in a header? diff --git a/src/gfx/render_shapes.hpp b/src/gfx/render_shapes.hpp index e11f9ba4..d56610ae 100644 --- a/src/gfx/render_shapes.hpp +++ b/src/gfx/render_shapes.hpp @@ -67,6 +67,14 @@ namespace Colours { const sf::Color DARK_GREEN { 0x00, 0x60, 0x00}; // formerly c[5] QD colour = {0,40959,0} (talking buttons) const sf::Color LIGHT_GREEN { 0x00, 0xa0, 0x00}; // formerly c[6] QD colour = {0,24575,0} (talking buttons pressed) const sf::Color DARK_RED { 0xa0, 0x00, 0x14}; // formerly c[7] (clickable text, new in OBoE) + // Extra colors + const sf::Color LIME { 0x00, 0xFF, 0x00}; + const sf::Color AQUA { 0x00, 0xFF, 0xFF}; + const sf::Color FUCHSIA { 0xFF, 0x00, 0xFF}; + const sf::Color MAROON { 0x80, 0x00, 0x00}; + const sf::Color OLIVE { 0x80, 0x80, 0x00}; + const sf::Color PURPLE { 0x80, 0x00, 0x80}; + const sf::Color SILVER { 0xC0, 0xC0, 0xC0}; } const sf::Color PRESET_WORD_ON = Colours::DARK_GREEN;