From 363bfb9798285bfe0ad7843d957c9834ff3db7ac Mon Sep 17 00:00:00 2001 From: Ricardo Cruz Date: Mon, 28 Jun 2004 17:12:34 +0000 Subject: [PATCH] When a menu is disabled, it now uses Benjamin's gray fonts! SVN-Revision: 1516 --- src/globals.cpp | 5 +---- src/globals.h | 3 ++- src/menu.cpp | 2 +- src/setup.cpp | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/globals.cpp b/src/globals.cpp index 0c16a3097..6a4aaab4c 100644 --- a/src/globals.cpp +++ b/src/globals.cpp @@ -38,12 +38,9 @@ JoystickKeymap::JoystickKeymap() JoystickKeymap joystick_keymap; SDL_Surface * screen; -Font* black_text; Font* gold_text; -Font* silver_text; Font* blue_text; -Font* red_text; -Font* green_text; +Font* gray_text; Font* yellow_nums; Font* white_text; Font* white_small_text; diff --git a/src/globals.h b/src/globals.h index 643bd1089..e2c4fff88 100644 --- a/src/globals.h +++ b/src/globals.h @@ -51,9 +51,10 @@ extern JoystickKeymap joystick_keymap; extern SDL_Surface* screen; extern Font* gold_text; extern Font* white_text; +extern Font* blue_text; +extern Font* gray_text; extern Font* white_small_text; extern Font* white_big_text; -extern Font* blue_text; extern Font* yellow_nums; extern MouseCursor * mouse_cursor; diff --git a/src/menu.cpp b/src/menu.cpp index d59483cc9..2a2bce2da 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -551,7 +551,7 @@ Menu::draw_item(DrawingContext& context, { case MN_DEACTIVE: { - context.draw_text_center(blue_text, pitem.text, + context.draw_text_center(gray_text, pitem.text, Vector(0, y_pos - int(blue_text->get_height()/2)), LAYER_FOREGROUND1); break; diff --git a/src/setup.cpp b/src/setup.cpp index 87f1ffdbf..da650e235 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -590,6 +590,8 @@ void st_general_setup(void) blue_text = new Font(datadir + "/images/fonts/blue.png", Font::TEXT, 16,18,3); white_text = new Font(datadir + "/images/fonts/white.png", Font::TEXT, 16,18); + gray_text = new Font(datadir + "/images/fonts/gray.png", + Font::TEXT, 16,18); white_small_text = new Font(datadir + "/images/fonts/white-small.png", Font::TEXT, 8,9, 1); white_big_text = new Font(datadir + "/images/fonts/white-big.png", -- 2.11.0