[Super-tux-commit] supertux/src globals.h,1.31,1.32 setup.cpp,1.92,1.93

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20739/src

Modified Files:
	globals.h setup.cpp 
Log Message:
new versions of all fonts

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- setup.cpp	2 Jun 2004 20:06:56 -0000	1.92
+++ setup.cpp	2 Jun 2004 20:54:46 -0000	1.93
@@ -583,27 +583,16 @@
   SDL_EnableUNICODE(1);
 
   /* Load global images: */
-
-  black_text  = new Font(datadir + "/images/status/letters-black.png",
-      Font::TEXT, 16,18);
-  gold_text   = new Font(datadir + "/images/status/letters-gold.png",
-      Font::TEXT, 16,18);
-  silver_text = new Font(datadir + "/images/status/letters-silver.png",
-      Font::TEXT, 16,18);
-  blue_text   = new Font(datadir + "/images/status/letters-blue.png",
-      Font::TEXT, 16, 18, 3);
-  red_text    = new Font(datadir + "/images/status/letters-red.png",
-      Font::TEXT, 16,18);
-  green_text  = new Font(datadir + "/images/status/letters-green.png",
-      Font::TEXT, 16,18);
-  white_text  = new Font(datadir + "/images/fonts/letters-white.png",
+  gold_text = new Font(datadir + "/images/fonts/gold.png", Font::TEXT, 16,18);
+  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);
-  white_small_text = new Font(datadir +
-      "/images/status/letters-white-small.png", Font::TEXT, 8,9, 1);
-  white_big_text   = new Font(datadir + "/images/fonts/letters-white-big.png",
+  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",
       Font::TEXT, 20,22, 3);
-  yellow_nums = new Font(datadir + "/images/status/numbers.png",
-      Font::TEXT, 32,32);
+  yellow_nums = new Font(datadir + "/images/fonts/numbers.png",
+      Font::NUM, 32,32);
 
   /* Load GUI/menu images: */
   checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
@@ -622,13 +611,9 @@
 {
 
   /* Free global images: */
-  delete black_text;
   delete gold_text;
-  delete silver_text;
   delete white_text;
   delete blue_text;
-  delete red_text;
-  delete green_text;
   delete white_small_text;
   delete white_big_text;
   delete yellow_nums;

Index: globals.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/globals.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- globals.h	30 May 2004 01:08:48 -0000	1.31
+++ globals.h	2 Jun 2004 20:54:46 -0000	1.32
@@ -46,16 +46,12 @@
 
 extern JoystickKeymap joystick_keymap;
 
-extern SDL_Surface * screen;
-extern Font* black_text;
+extern SDL_Surface* screen;
 extern Font* gold_text;
-extern Font* silver_text;
 extern Font* white_text;
 extern Font* white_small_text;
 extern Font* white_big_text;
 extern Font* blue_text;
-extern Font* red_text;
-extern Font* green_text;
 extern Font* yellow_nums;
 
 extern MouseCursor * mouse_cursor;