<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40691 >
As reported on i18n. The SDL_ttf error message typo appears to have already been fixed in trunk. ----------------------------------------------------------------------- 脳の初期化は中断しています。
commit 7b93f71bfcb0ba2e640bf512d045c872dd080cfe Author: Madeline Book <madeline.b...@gmail.com> Date: Tue Jan 27 16:11:55 2009 -0500 Fix typo and remove unused code block in sdl code. Reported by: Sini Ruohomaa <sini.ruoho...@cs.helsinki.fi> diff --git a/client/gui-sdl/graphics.c b/client/gui-sdl/graphics.c index c9f10c9..25daf43 100644 --- a/client/gui-sdl/graphics.c +++ b/client/gui-sdl/graphics.c @@ -1018,8 +1018,8 @@ void init_sdl(int iFlags) /* Initialize the TTF library */ if (TTF_Init() < 0) { - freelog(LOG_FATAL, _("Unable to initialize SDL_ttf library: %s"), - SDL_GetError()); + freelog(LOG_FATAL, _("Unable to initialize SDL_ttf library: %s"), + SDL_GetError()); exit(2); } diff --git a/client/gui-sdl/gui_string.c b/client/gui-sdl/gui_string.c index 7f8bce7..0a65db5 100644 --- a/client/gui-sdl/gui_string.c +++ b/client/gui-sdl/gui_string.c @@ -601,15 +601,6 @@ static TTF_Font * load_font(Uint16 ptsize) if(!pFont_with_FullPath) { const char *path = theme_font_filename(theme); -#if 0 - if(!path) { - path = datafilename("stdfont.ttf"); - if (!path) { - die(_("Couldn't find stdfont.ttf file. Please link/copy/move any" - "unicode ttf font to data dir as stdfont.ttf")); - } - } -#endif pFont_with_FullPath = mystrdup(path); assert(pFont_with_FullPath != NULL); }
diff --git a/client/gui-sdl/gui_string.c b/client/gui-sdl/gui_string.c index 7f8bce7..0a65db5 100644 --- a/client/gui-sdl/gui_string.c +++ b/client/gui-sdl/gui_string.c @@ -601,15 +601,6 @@ static TTF_Font * load_font(Uint16 ptsize) if(!pFont_with_FullPath) { const char *path = theme_font_filename(theme); -#if 0 - if(!path) { - path = datafilename("stdfont.ttf"); - if (!path) { - die(_("Couldn't find stdfont.ttf file. Please link/copy/move any" - "unicode ttf font to data dir as stdfont.ttf")); - } - } -#endif pFont_with_FullPath = mystrdup(path); assert(pFont_with_FullPath != NULL); }
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev