From c5d1c075d727b79ee95b98e539996ab042cd6ea3 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sat, 19 Jul 2003 10:12:18 +0000 Subject: [PATCH] Fixed bug where translated text would revert to English in 'uppercase' mode. --- docs/CHANGES.txt | 2 ++ src/tuxpaint.c | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index d2224985f..5073d47de 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -27,6 +27,8 @@ http://www.newbreedsoftware.com/tuxpaint/ * Chinese translation update. Wang Jian + * Fixed bug where translated text would revert to English in 'uppercase' mode. + 2003.Jun.17 (0.9.11) * Windows bugfixes. diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 8dbfe84f6..887ec3e72 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -2055,7 +2055,7 @@ void mainloop(void) } else { - draw_tux_text(TUX_GREAT, event.user.data1, 0, 1, 0); + draw_tux_text(TUX_GREAT, (char *) event.user.data1, 0, 1, 0); } } else @@ -6329,7 +6329,6 @@ void draw_tux_text(int which_tux, char * str, int want_utf8, { SDL_Rect dest; SDL_Color black = {0, 0, 0, 0}; - char * upper_str; /* Remove any text-changing timer if one is running: */ @@ -6358,15 +6357,12 @@ void draw_tux_text(int which_tux, char * str, int want_utf8, SDL_BlitSurface(img_tux[which_tux], NULL, screen, &dest); - upper_str = uppercase(str); - wordwrap_text(font, upper_str, black, + wordwrap_text(font, str, black, img_tux[which_tux] -> w + 5, (48 * 7) + 40 + 48 + HEIGHTOFFSET + 5, WINDOW_WIDTH, want_utf8, force_locale_font, want_right_to_left); - free(upper_str); - /* Update the display: */