add back the extra colours
This commit is contained in:
@@ -36,7 +36,15 @@ std::map<std::string,sf::Color> colour_map = {
|
|||||||
{"dark_blue", Colours::DARK_BLUE},
|
{"dark_blue", Colours::DARK_BLUE},
|
||||||
{"dark-green", Colours::DARK_GREEN},
|
{"dark-green", Colours::DARK_GREEN},
|
||||||
{"light-green", Colours::LIGHT_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?
|
// TODO: Put these classes in a header?
|
||||||
|
@@ -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 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 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)
|
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;
|
const sf::Color PRESET_WORD_ON = Colours::DARK_GREEN;
|
||||||
|
Reference in New Issue
Block a user