When a menu is disabled, it now uses Benjamin's gray fonts!

SVN-Revision: 1516

diff --git a/src/globals.cpp b/src/globals.cpp
index 0c16a30..6a4aaab 100644 (file)
--- 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 643bd10..e2c4fff 100644 (file)
--- 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 d59483c..2a2bce2 100644 (file)
--- 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 87f1ffd..da650e2 100644 (file)
--- 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",