diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | po/cs_CZ.po | 9 | ||||
| -rw-r--r-- | po/de_DE.po | 10 | ||||
| -rw-r--r-- | po/tuxanci.pot | 9 | ||||
| -rw-r--r-- | src/base/path.h.in | 2 | ||||
| -rwxr-xr-x | src/client/font.c | 7 | ||||
| -rwxr-xr-x | src/client/font.h | 2 |
8 files changed, 28 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea93571..59b8fcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ # -DLIB_INSTALL_DIR=/other/bla # install path for lib # -DCMAKE_DOC_PATH=/other/bla # install path for doc # -DCMAKE_LOCALE_PATH=/other/bla # install path for locale +# -DCMAKE_FONT=/bla/font.ttf # install path for locale ############################################################################### # IMPORTANT DEFINITIONS [PREFIX,...] ############################################################################### @@ -55,6 +56,7 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) # this specify location of additional cmake sources SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables +SET ( CMAKE_FONT "${CMAKE_INSTALL_PREFIX}/share/${appname}/font/DejavVuSans.ttf" CACHE PATH "Font" ) SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} ) SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} ) @@ -95,6 +95,7 @@ HOWTO COMPILE # -DLIB_INSTALL_DIR=/other/bla # install path for libraries # -DCMAKE_DOC_PATH=/other/bla # install path for doc # -DCMAKE_LOCALE_PATH=/bla # install path for locale + # -DCMAKE_FONT=/bla/font.ttf # install path for locale GAME USAGE ========== Starting game is simple tuxanci-VERSION or tuxanci-server-V. based on what we diff --git a/po/cs_CZ.po b/po/cs_CZ.po index d1ae3c9..7403910 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tuxanci\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-20 18:47+0200\n" +"POT-Creation-Date: 2008-08-22 13:25+0200\n" "PO-Revision-Date: 2008-08-19 13:20+0200\n" "Last-Translator: tilyanLanguage-Team: CZECH <cs@li.org>\n" "MIME-Version: 1.0\n" @@ -114,7 +114,12 @@ msgstr "Nahrávám obrázek %s\n" msgid "Quitting image database\n" msgstr "Zavírám databázi obrázků\n" -#: src/client/font.c:140 +#: src/client/font.c:39 +#, fuzzy, c-format +msgid "Loading font: \"%s\"\n" +msgstr "Načítám modul: \"%s\"\n" + +#: src/client/font.c:135 #, c-format msgid "Unloading font\n" msgstr "Uvolňuji font\n" diff --git a/po/de_DE.po b/po/de_DE.po index 0ebfb31..09824ad 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tuxanci\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-20 18:47+0200\n" +"POT-Creation-Date: 2008-08-22 13:25+0200\n" "PO-Revision-Date: 2008-08-19 00:37+0200\n" "Last-Translator: Marcel 'frostwork' Unbehaun\n" "Language-Team: GERMAN <de@li.org>\n" @@ -114,7 +114,12 @@ msgstr "Lade Bild %s\n" msgid "Quitting image database\n" msgstr "Schliesse Bild Datenbank\n" -#: src/client/font.c:140 +#: src/client/font.c:39 +#, c-format +msgid "Loading font: \"%s\"\n" +msgstr "Lade font: \"%s\"\n" + +#: src/client/font.c:135 #, c-format msgid "Unloading font\n" msgstr "Schliesse Font\n" @@ -448,6 +453,7 @@ msgid "Quitting screen world\n" msgstr "Beende Welt\n" #: src/screen/screen_mainMenu.c:104 +#, c-format msgid "Start game" msgstr "Starte Spiel" diff --git a/po/tuxanci.pot b/po/tuxanci.pot index 0c8002d..41db951 100644 --- a/po/tuxanci.pot +++ b/po/tuxanci.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-20 18:47+0200\n" +"POT-Creation-Date: 2008-08-22 13:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -115,7 +115,12 @@ msgstr "" msgid "Quitting image database\n" msgstr "" -#: src/client/font.c:140 +#: src/client/font.c:39 +#, c-format +msgid "Loading font: \"%s\"\n" +msgstr "" + +#: src/client/font.c:135 #, c-format msgid "Unloading font\n" msgstr "" diff --git a/src/base/path.h.in b/src/base/path.h.in index ff0502d..d2b75d4 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -18,7 +18,7 @@ #define PATH_MODULES PREFIX "/bin/" #endif #define PATH_IMAGE PATH_DIR "images/" - #define PATH_FONT PATH_DIR "font/" + #define FONT_FILE "@CMAKE_FONT@" #define PATH_ARENA PATH_DIR "arena/" #define PATH_SOUND PATH_DIR "sound/" #define PATH_MUSIC PATH_DIR "music/" diff --git a/src/client/font.c b/src/client/font.c index 07b98f4..5f4e692 100755 --- a/src/client/font.c +++ b/src/client/font.c @@ -12,11 +12,6 @@ bool_t isFontInicialized() return isFontInit; } -/* - * Inicialuzuje font. - * nacita font zo suboru *file o velkosti size - * Automaticky sa styk nastavy ako TTF_STYLE_BOLD - */ void initFont(char *file,int size) { char str[STR_PATH_SIZE]; @@ -41,7 +36,7 @@ void initFont(char *file,int size) fontSize = size; #ifdef DEBUG - printf("Loading font: \"%s\"\n", file); + printf(_("Loading font: \"%s\"\n"), file); #endif isFontInit = TRUE; } diff --git a/src/client/font.h b/src/client/font.h index 418cef3..b404e59 100755 --- a/src/client/font.h +++ b/src/client/font.h @@ -16,7 +16,7 @@ #define COLOR_YELLOW 255, 255, 0 #define FONT_SIZE 16 -#define FONT_FILE "DejaVuSans.ttf" + extern bool_t isFontInicialized(); extern void initFont(char *file,int size); extern void drawFont(char *s,int x,int y,int r,int g,int b); |