From e2fe84bf2b0bbaff9e9ea639b358371cf71d265a Mon Sep 17 00:00:00 2001 From: Ricardo Cruz Date: Thu, 10 Jun 2004 13:54:20 +0000 Subject: [PATCH] Tweaked pause level name text. Would be neat if the draw_text() at DrawingContext would allow formatted text. Would just need a parser, and would avoid all these hacks. SVN-Revision: 1461 --- po/de.po | 34 +++++++++++++++++----------------- po/pt.po | 37 +++++++++++++++++++------------------ po/supertux.pot | 34 +++++++++++++++++----------------- src/gameloop.cpp | 20 ++++++++++++-------- 4 files changed, 65 insertions(+), 60 deletions(-) diff --git a/po/de.po b/po/de.po index d6df34781..082d5ec0e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: SuperTux 0.1.1\n" "Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: 2004-06-03 00:29+0200\n" "Last-Translator: \n" "Language-Team: German \n" @@ -25,56 +25,56 @@ msgstr "" msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "" + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "" diff --git a/po/pt.po b/po/pt.po index bf5727dab..d127ab1ac 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,6 +1,7 @@ # translation of pt.po to # translation of pt.po to # translation of pt.po to +# translation of pt.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR SuperTux Development Team. # Ricardo Cruz , 2004. @@ -9,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: pt\n" "Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" -"PO-Revision-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" +"PO-Revision-Date: 2004-06-10 14:53+0100\n" "Last-Translator: Ricardo Cruz \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,56 +27,56 @@ msgstr "por " msgid "PAUSE - Press 'P' To Play" msgstr "PAUSA - Carrega no 'P' para continuar" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "Jogando: " + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "PONTOS" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "Carrega no ESC para sair" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "PASSOU O TEMPO" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "TEMPO" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "MOEDAS" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "VIDAS" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "Jogando: %s" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "Resultado:" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "PONTOS: %d" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "MOEDAS: %d" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "Slot %d - Jogo gravado" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "Slot %d - Livre" diff --git a/po/supertux.pot b/po/supertux.pot index 9c0c70408..95e4ce96e 100644 --- a/po/supertux.pot +++ b/po/supertux.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: super-tux-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2004-06-09 18:34+0100\n" +"POT-Creation-Date: 2004-06-10 14:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,56 +24,56 @@ msgstr "" msgid "PAUSE - Press 'P' To Play" msgstr "" -#: src/gameloop.cpp:702 src/worldmap.cpp:849 +#: src/gameloop.cpp:528 +#, c-format +msgid "Playing: " +msgstr "" + +#: src/gameloop.cpp:714 src/worldmap.cpp:849 msgid "SCORE" msgstr "" -#: src/gameloop.cpp:707 +#: src/gameloop.cpp:719 msgid "Press ESC To Return" msgstr "" -#: src/gameloop.cpp:712 +#: src/gameloop.cpp:724 msgid "TIME's UP" msgstr "" -#: src/gameloop.cpp:716 +#: src/gameloop.cpp:728 msgid "TIME" msgstr "" -#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:853 +#: src/gameloop.cpp:735 src/gameloop.cpp:736 src/worldmap.cpp:853 msgid "COINS" msgstr "" -#: src/gameloop.cpp:745 src/gameloop.cpp:746 src/worldmap.cpp:874 +#: src/gameloop.cpp:757 src/gameloop.cpp:758 src/worldmap.cpp:874 #: src/worldmap.cpp:875 msgid "LIVES" msgstr "" -#: src/gameloop.cpp:751 -#, c-format -msgid "Playing: %s" -msgstr "" - -#: src/gameloop.cpp:776 +#: src/gameloop.cpp:780 msgid "Result:" msgstr "" -#: src/gameloop.cpp:779 src/worldmap.cpp:726 +#: src/gameloop.cpp:783 src/worldmap.cpp:726 #, c-format msgid "SCORE: %d" msgstr "" -#: src/gameloop.cpp:782 src/worldmap.cpp:730 +#: src/gameloop.cpp:786 src/worldmap.cpp:730 #, c-format msgid "COINS: %d" msgstr "" -#: src/gameloop.cpp:811 +#: src/gameloop.cpp:815 #, c-format msgid "Slot %d - Savegame" msgstr "" -#: src/gameloop.cpp:814 +#: src/gameloop.cpp:818 #, c-format msgid "Slot %d - Free" msgstr "" diff --git a/src/gameloop.cpp b/src/gameloop.cpp index 790b8afdb..60aa30561 100644 --- a/src/gameloop.cpp +++ b/src/gameloop.cpp @@ -522,6 +522,18 @@ GameSession::draw() Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1); context->draw_text_center(blue_text, _("PAUSE - Press 'P' To Play"), Vector(0, 230), LAYER_FOREGROUND1+2); + + char str1[60]; + char str2[124]; + sprintf(str1, _("Playing: ")); + sprintf(str2, level->name.c_str()); + + context->draw_text(blue_text, str1, + Vector((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340), + LAYER_FOREGROUND1+2); + context->draw_text(white_text, str2, + Vector(((screen->w - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340), + LAYER_FOREGROUND1+2); } if(Menu::current()) @@ -746,14 +758,6 @@ GameSession::drawstatus(DrawingContext& context) Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 20), LAYER_FOREGROUND1); - if(game_pause) - { - sprintf(str, _("Playing: %s"), level->name.c_str()); - - context.draw_text(white_text, str, Vector(0,20), - LAYER_FOREGROUND1); - } - if(show_fps) { sprintf(str, "%2.1f", fps_fps); -- 2.11.0