Author: cazfi
Date: Sat Aug 22 18:29:46 2015
New Revision: 29644
URL: http://svn.gna.org/viewcvs/freeciv?rev=29644&view=rev
Log:
Replaced string16 uses with utf8_str use in mapview.c
See patch #6272
Modified:
branches/S2_6/client/gui-sdl2/mapview.c
Modified: branches/S2_6/client/gui-sdl2/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapview.c?rev=29644&r1=29643&r2=29644&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/mapview.c (original)
+++ branches/S2_6/client/gui-sdl2/mapview.c Sat Aug 22 18:29:46 2015
@@ -407,22 +407,22 @@
#else
SDL_Rect area = {0, 3, 0, 0};
#endif
- SDL_String16 *pText;
+ struct utf8_str *ptext;
if (get_current_client_page() != PAGE_GAME) {
return;
}
#ifdef SMALL_SCREEN
- pText = create_string16(NULL, 0, 8);
+ ptext = create_utf8_str(NULL, 0, 8);
#else
- pText = create_string16(NULL, 0, 10);
+ ptext = create_utf8_str(NULL, 0, 10);
#endif
/* set text settings */
- pText->style |= TTF_STYLE_BOLD;
- pText->fgcol = *get_theme_color(COLOR_THEME_MAPVIEW_INFO_TEXT);
- pText->bgcol = (SDL_Color) {0, 0, 0, 0};
+ ptext->style |= TTF_STYLE_BOLD;
+ ptext->fgcol = *get_theme_color(COLOR_THEME_MAPVIEW_INFO_TEXT);
+ ptext->bgcol = (SDL_Color) {0, 0, 0, 0};
if (NULL != client.conn.playing) {
#ifdef SMALL_SCREEN
@@ -446,8 +446,8 @@
client.conn.playing->economic.science);
#endif /* SMALL_SCREEN */
/* convert to unistr and create text surface */
- copy_chars_to_string16(pText, buffer);
- pTmp = create_text_surf_from_str16(pText);
+ copy_chars_to_utf8_str(ptext, buffer);
+ pTmp = create_text_surf_from_utf8(ptext);
area.x = (main_window_width() - pTmp->w) / 2 - adj_size(5);
area.w = pTmp->w + adj_size(8);
@@ -488,7 +488,7 @@
update_timeout_label();
- FREESTRING16(pText);
+ FREEUTF8STR(ptext);
queue_flush();
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
