new versions of all fonts

SVN-Revision: 1385

diff --git a/data/Makefile.am b/data/Makefile.am
index 2b14c90..ea1af95 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
   $(wildcard images/*.xpm) \
   $(wildcard images/background/*.png) \
   $(wildcard images/background/*.jpg) \
+  $(wildcard images/fonts/*.png) \
   $(wildcard images/highscore/*.png) \
   $(wildcard images/icons/*.png) \
   $(wildcard images/icons/*.xpm) \

diff --git a/data/images/fonts/blue.png b/data/images/fonts/blue.png
new file mode 100644 (file)
index 0000000..f4bbae6
Binary files /dev/null and b/data/images/fonts/blue.png differ

diff --git a/data/images/fonts/gold.png b/data/images/fonts/gold.png
new file mode 100644 (file)
index 0000000..7e40e33
Binary files /dev/null and b/data/images/fonts/gold.png differ

diff --git a/data/images/fonts/letters-white-big.png b/data/images/fonts/letters-white-big.png
deleted file mode 100644 (file)
index cc478ce..0000000
Binary files a/data/images/fonts/letters-white-big.png and /dev/null differ

diff --git a/data/images/fonts/letters-white.png b/data/images/fonts/letters-white.png
deleted file mode 100644 (file)
index 3d83e8a..0000000
Binary files a/data/images/fonts/letters-white.png and /dev/null differ

diff --git a/data/images/fonts/numbers.png b/data/images/fonts/numbers.png
new file mode 100644 (file)
index 0000000..8ac3083
Binary files /dev/null and b/data/images/fonts/numbers.png differ

diff --git a/data/images/fonts/white-big.png b/data/images/fonts/white-big.png
new file mode 100644 (file)
index 0000000..65e7c00
Binary files /dev/null and b/data/images/fonts/white-big.png differ

diff --git a/data/images/fonts/white-small.png b/data/images/fonts/white-small.png
new file mode 100644 (file)
index 0000000..a50a66a
Binary files /dev/null and b/data/images/fonts/white-small.png differ

diff --git a/data/images/fonts/white.png b/data/images/fonts/white.png
new file mode 100644 (file)
index 0000000..c3b2d6e
Binary files /dev/null and b/data/images/fonts/white.png differ

diff --git a/src/globals.h b/src/globals.h
index a30e66a..5a68fc8 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -46,16 +46,12 @@ struct JoystickKeymap
 
 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;

diff --git a/src/screen/font.cpp b/src/screen/font.cpp
index d77e335..b0c3ecb 100644 (file)
--- a/src/screen/font.cpp
+++ b/src/screen/font.cpp
@@ -44,7 +44,6 @@ Font::Font(const std::string& file, FontType ntype, int nw, int nh,
   last_char = first_char + (chars->h / h) * 16;
   if(last_char > 127) // we have left out some control chars at 128-159
     last_char += 32;
-  printf("Chars: %d-%d.\n", first_char, last_char);
    
   // Load shadow font.
   if(shadowsize > 0) {

diff --git a/src/setup.cpp b/src/setup.cpp
index 83eac4c..b5b3044 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -583,27 +583,16 @@ void st_general_setup(void)
   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 @@ void st_general_free(void)
 {
 
   /* 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;