diff --git a/color.hpp b/color.hpp index bdf0f54..204c135 100644 --- a/color.hpp +++ b/color.hpp @@ -1,6 +1,6 @@ #pragma once -namespace color { +namespace ColorValue { const sf::Color BLACK{1, 4, 2}; const sf::Color DARK_DARK{9, 29, 16}; const sf::Color DARK_MID{14, 50, 26}; diff --git a/panel.hpp b/panel.hpp index e6d5bd8..05fcb8e 100644 --- a/panel.hpp +++ b/panel.hpp @@ -23,9 +23,9 @@ struct Panel { bool has_border = false; bool must_clear = true; bool grid = false; - sf::Color default_bg = color::BLACK; - sf::Color default_fg = color::LIGHT_LIGHT; - sf::Color border_color = color::MID; + sf::Color default_bg = ColorValue::BLACK; + sf::Color default_fg = ColorValue::LIGHT_LIGHT; + sf::Color border_color = ColorValue::MID; int border_px = UI_PANEL_BORDER_PX; bool $dirty = true; diff --git a/render.cpp b/render.cpp index 8299332..f453f5c 100644 --- a/render.cpp +++ b/render.cpp @@ -20,8 +20,8 @@ SFMLRender::SFMLRender() : $window(sf::VideoMode($config.video_x,$config.video_y), "Roguish"), $map_font_size(0), $line_spacing(0), - $default_fg(color::LIGHT_MID), - $default_bg(color::BLACK), + $default_fg(ColorValue::LIGHT_MID), + $default_bg(ColorValue::BLACK), $ansi($default_fg, $default_bg) { // force true color, but maybe I want to support different color sets @@ -30,7 +30,7 @@ SFMLRender::SFMLRender() : $ui_text.setFont($font); $ui_text.setPosition(0,0); $ui_text.setCharacterSize($config.ui_font_size); - $ui_text.setFillColor(color::LIGHT_MID); + $ui_text.setFillColor(ColorValue::LIGHT_MID); sf::Glyph glyph = $font.getGlyph($config.ui_base_char, $config.ui_font_size, false); $ui_bounds = glyph.bounds; } diff --git a/status.txt b/status.txt index bdb281a..842020b 100644 --- a/status.txt +++ b/status.txt @@ -1,6 +1,4 @@ TODAY'S GOAL: -* color namespace is too ambiguous - * Pathing::compute_paths can take a starting level to implement lower directions, or possibly setting a value lower? * Fix " room should always be found"