Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21693/src
Modified Files:
globals.cpp globals.h menu.cpp setup.cpp
Log Message:
When a menu is disabled, it now uses Benjamin's gray fonts!
Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- menu.cpp 14 Jun 2004 18:10:37 -0000 1.80
+++ menu.cpp 28 Jun 2004 17:12:34 -0000 1.81
@@ -551,7 +551,7 @@
{
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;
Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- setup.cpp 22 Jun 2004 12:43:42 -0000 1.103
+++ setup.cpp 28 Jun 2004 17:12:34 -0000 1.104
@@ -590,6 +590,8 @@
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",
Index: globals.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/globals.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- globals.cpp 30 May 2004 01:08:48 -0000 1.21
+++ globals.cpp 28 Jun 2004 17:12:34 -0000 1.22
@@ -38,12 +38,9 @@
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;
Index: globals.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/globals.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- globals.h 9 Jun 2004 05:23:20 -0000 1.33
+++ globals.h 28 Jun 2004 17:12:34 -0000 1.34
@@ -51,9 +51,10 @@
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;
|
