From: divverent Date: Fri, 6 May 2011 18:32:45 +0000 (+0000) Subject: to resolve the format string madness once and for all: write explicit casts for all... X-Git-Tag: xonotic-v0.6.0~163^2~436 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40855ff3b420e5fd179f4e3b64ac51acdef3509a;p=xonotic%2Fdarkplaces.git to resolve the format string madness once and for all: write explicit casts for all args in this printf git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11110 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/ft2.c b/ft2.c index 859c92ba..51d892e6 100644 --- a/ft2.c +++ b/ft2.c @@ -1211,16 +1211,16 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ // create a totally unique name for this map, then we will use it to make a unique cachepic_t to avoid redundant textures dpsnprintf(map_identifier, sizeof(map_identifier), - "%s_cache_%g_%u_%g_%g_%g_%g_%g_%u", + "%s_cache_%g_%d_%g_%g_%g_%g_%g_%u", font->name, - mapstart->intSize, - load_flags, - font->settings->blur, - font->settings->outline, - font->settings->shadowx, - font->settings->shadowy, - font->settings->shadowz, - (unsigned)map->start/FONT_CHARS_PER_MAP); + (double) mapstart->intSize, + (int) load_flags, + (double) font->settings->blur, + (double) font->settings->outline, + (double) font->settings->shadowx, + (double) font->settings->shadowy, + (double) font->settings->shadowz, + (unsigned) map->start/FONT_CHARS_PER_MAP); // create a cachepic_t from the data now, or reuse an existing one map->pic = Draw_CachePic_Flags(map_identifier, CACHEPICFLAG_QUIET);