File diff r2106:c87c9f2f4751 → r2107:9afd88815f5d
gfx.c
Show inline comments
 
@@ -258,15 +258,15 @@ enum {
 

	
 
/** Truncate a given string to a maximum width if neccessary.
 
 * If the string is truncated, add three dots ('...') to show this.
 
 * @param *dest string that is checked and possibly truncated
 
 * @param maxw maximum width in pixels of the string
 
 * @return new width of (truncated) string */
 
static int TruncateString(char *str, uint maxw)
 
static uint TruncateString(char *str, uint maxw)
 
{
 
	int w = 0;
 
	uint w = 0;
 
	int base = _stringwidth_base;
 
	int ddd, ddd_w;
 

	
 
	byte c;
 
	char *ddd_pos;
 

	
 
@@ -302,13 +302,13 @@ static int TruncateString(char *str, uin
 
		}
 
	}
 

	
 
	return w;
 
}
 

	
 
static inline int TruncateStringID(StringID src, char *dest, uint maxw)
 
static inline uint TruncateStringID(StringID src, char *dest, uint maxw)
 
{
 
	GetString(dest, src);
 
	return TruncateString(dest, maxw);
 
}
 

	
 
/* returns right coordinate */
 
@@ -358,13 +358,13 @@ int DrawStringCentered(int x, int y, Str
 
	return w;
 
}
 

	
 
int DrawStringCenteredTruncated(int x, int y, StringID str, uint16 color, uint maxw)
 
{
 
	char buffer[512];
 
	int w = TruncateStringID(str, buffer, maxw);
 
	uint w = TruncateStringID(str, buffer, maxw);
 
	return DoDrawString(buffer, x - (w / 2), y, color);
 
}
 

	
 
void DrawStringCenterUnderline(int x, int y, StringID str, uint16 color)
 
{
 
	int w = DrawStringCentered(x, y, str, color);