Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9831
Modified Files:
gameloop.cpp setup.cpp worldmap.cpp
Log Message:
cleaned up font drawing code and added support for latin1 font of litespeed
Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- worldmap.cpp 31 May 2004 22:13:15 -0000 1.80
+++ worldmap.cpp 2 Jun 2004 20:06:56 -0000 1.81
@@ -864,8 +864,8 @@
context.draw_text(gold_text, str,
Vector(screen->w - gold_text->get_text_width(str) - tux_life->w, 0),
LAYER_FOREGROUND1);
- context.draw_surface(tux_life, Vector(screen->w - gold_text->w, 0),
- LAYER_FOREGROUND1);
+ context.draw_surface(tux_life, Vector(screen->w -
+ gold_text->get_text_width("9"), 0), LAYER_FOREGROUND1);
}
else
{
Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- gameloop.cpp 31 May 2004 22:13:15 -0000 1.143
+++ gameloop.cpp 2 Jun 2004 20:06:55 -0000 1.144
@@ -720,12 +720,14 @@
sprintf(str, "%d", player_status.distros);
context.draw_text(white_text, "COINS",
- Vector(screen->w - white_text->w*9, 0), LAYER_FOREGROUND1);
+ Vector(screen->w - white_text->get_text_width("COINS "), 0),
+ LAYER_FOREGROUND1);
context.draw_text(gold_text, str,
- Vector(screen->w - gold_text->w*2, 0), LAYER_FOREGROUND1);
+ Vector(screen->w - gold_text->get_text_width("99"), 0),LAYER_FOREGROUND1);
context.draw_text(white_text, "LIVES",
- Vector(screen->w - white_text->w*9, 20), LAYER_FOREGROUND1);
+ Vector(screen->w - white_text->get_text_width("LIVES "), 20),
+ LAYER_FOREGROUND1);
if (player_status.lives >= 5)
{
sprintf(str, "%dx", player_status.lives);
@@ -746,7 +748,8 @@
{
sprintf(str, "%2.1f", fps_fps);
context.draw_text(white_text, "FPS",
- Vector(screen->w - white_text->w*9, 40), LAYER_FOREGROUND1);
+ Vector(screen->w - white_text->get_text_width("FPS "), 40),
+ LAYER_FOREGROUND1);
context.draw_text(gold_text, str,
Vector(screen->w-4*16, 40), LAYER_FOREGROUND1);
}
Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- setup.cpp 31 May 2004 23:47:05 -0000 1.91
+++ setup.cpp 2 Jun 2004 20:06:56 -0000 1.92
@@ -584,19 +584,26 @@
/* Load global images: */
- black_text = new Font(datadir + "/images/status/letters-black.png", TEXT_TEXT, 16,18);
- gold_text = new Font(datadir + "/images/status/letters-gold.png", TEXT_TEXT, 16,18);
- silver_text = new Font(datadir + "/images/status/letters-silver.png", TEXT_TEXT, 16,18);
- blue_text = new Font(datadir + "/images/status/letters-blue.png", TEXT_TEXT,
- 16,18, 3);
- red_text = new Font(datadir + "/images/status/letters-red.png", TEXT_TEXT, 16,18);
- green_text = new Font(datadir + "/images/status/letters-green.png", TEXT_TEXT, 16,18);
- white_text = new Font(datadir + "/images/status/letters-white.png", TEXT_TEXT, 16,18);
+ 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",
+ Font::TEXT, 16,18);
white_small_text = new Font(datadir +
- "/images/status/letters-white-small.png", TEXT_TEXT, 8,9, 1);
- white_big_text = new Font(datadir + "/images/status/letters-white-big.png",
- TEXT_TEXT, 20,22, 3);
- yellow_nums = new Font(datadir + "/images/status/numbers.png", TEXT_NUM, 32,32);
+ "/images/status/letters-white-small.png", Font::TEXT, 8,9, 1);
+ white_big_text = new Font(datadir + "/images/fonts/letters-white-big.png",
+ Font::TEXT, 20,22, 3);
+ yellow_nums = new Font(datadir + "/images/status/numbers.png",
+ Font::TEXT, 32,32);
/* Load GUI/menu images: */
checkbox = new Surface(datadir + "/images/status/checkbox.png", USE_ALPHA);
|
