From 1142f65fdd5ccc3309a3da31fb1a0e7d5d0829fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Klou=C4=8Dek?= Date: Thu, 11 Sep 2008 18:19:22 +0000 Subject: [PATCH] Colors patch from qmax ( + added stat_hdr_color into levelintro.hpp...) SVN-Revision: 5765 --- src/colorscheme.cpp | 24 ++++++++++++------------ src/levelintro.cpp | 2 +- src/levelintro.hpp | 1 + src/statistics.cpp | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/colorscheme.cpp b/src/colorscheme.cpp index 4f62e94e5..228470476 100644 --- a/src/colorscheme.cpp +++ b/src/colorscheme.cpp @@ -1,23 +1,23 @@ #include "video/color.hpp" namespace LevelIntro { - Color header_color(1.0,1.0,1.0); + Color header_color(1.0,1.0,0.6); Color author_color(1.0,1.0,1.0); - Color stat_hdr_color(1.0,1.0,1.0); + Color stat_hdr_color(0.2,0.5,1.0); Color stat_color(1.0,1.0,1.0); } namespace Statistics { - Color header_color(0.5,1.0,0.2); - Color text_color(1.0,1.0,1.0); + Color header_color(1.0,1.0,1.0); + Color text_color(1.0,1.0,0.6); } namespace Menu { Color default_color(1.0,1.0,1.0); - Color active_color(0.6,1.0,1.0); - Color inactive_color(0.5,0.5,1.0); - Color label_color(0.8,0.4,0.2); - Color field_color(1.0,0.8,0.6); + Color active_color(0.2,0.5,1.0); + Color inactive_color(0.5,0.5,0.5); + Color label_color(0.0,1.0,1.0); + Color field_color(1.0,1.0,0.6); } namespace PlayerStatus { @@ -25,7 +25,7 @@ namespace PlayerStatus { } namespace TextObject { - Color default_color(1.0,1.0,0.6); + Color default_color(1.0,1.0,1.0); } namespace FloatingText { @@ -46,9 +46,9 @@ namespace Climbable { namespace WorldMapNS { namespace WorldMap { - Color level_title_color(1.0,1.0,0.2); - Color message_color(1.0,1.0,1.0); - Color teleporter_message_color(0.5,1.0,0.5); + Color level_title_color(1.0,1.0,1.0); + Color message_color(1.0,1.0,0.6); + Color teleporter_message_color(1.0,1.0,1.0); }} namespace TextScroller { diff --git a/src/levelintro.cpp b/src/levelintro.cpp index 5ad48a1b0..29660bee3 100644 --- a/src/levelintro.cpp +++ b/src/levelintro.cpp @@ -107,7 +107,7 @@ LevelIntro::draw(DrawingContext& context) py += 32; { - context.draw_center_text(normal_font, std::string("- ") + _("Best Level Statistics") + std::string(" -"), Vector(0, py), LAYER_FOREGROUND1, LevelIntro::header_color); + context.draw_center_text(normal_font, std::string("- ") + _("Best Level Statistics") + std::string(" -"), Vector(0, py), LAYER_FOREGROUND1, LevelIntro::stat_hdr_color); py += static_cast(normal_font->get_height()); } diff --git a/src/levelintro.hpp b/src/levelintro.hpp index 6765eed0d..4d8d14313 100644 --- a/src/levelintro.hpp +++ b/src/levelintro.hpp @@ -43,6 +43,7 @@ class LevelIntro : public Screen { static Color header_color; static Color author_color; + static Color stat_hdr_color; static Color stat_color; public: LevelIntro(const Level* level, const Statistics* best_level_statistics); diff --git a/src/statistics.cpp b/src/statistics.cpp index eddd71db0..515fb111e 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -159,7 +159,7 @@ Statistics::draw_worldmap_info(DrawingContext& context) } context.draw_text(small_font, caption_buf, Vector(WMAP_INFO_LEFT_X, posy), ALIGN_LEFT, LAYER_GUI, Statistics::header_color); - context.draw_text(small_font, stat_buf, Vector(WMAP_INFO_RIGHT_X, posy), ALIGN_RIGHT, LAYER_GUI, Statistics::text_color); + context.draw_text(small_font, stat_buf, Vector(WMAP_INFO_RIGHT_X, posy), ALIGN_RIGHT, LAYER_GUI, Statistics::header_color); posy += small_font->get_height() + 2; } -- 2.11.0