openttd-mini: comparison gfx.c

equal deleted inserted replaced

-:fe967eec43d1
+:e7cdf3ce0fb6
 // 11-14 -
 // 15-31 - 17 colors
 enum {
-	ASCII_LETTERSTART = 32,
 	ASCII_SETX = 1,
 	ASCII_SETXY = 2,
 	ASCII_TINYFONT = 8,
 	ASCII_BIGFONT = 9,
 		w = 0;
 		last_space = NULL;
 		for(;;) {
 			c = *str++;
-			if (c == ' ') last_space = str;
+			if (c == ASCII_LETTERSTART) last_space = str;
 			if (c >= ASCII_LETTERSTART) {
-				w += _stringwidth_table[base + ((byte)c) - 0x20];
+				w += GetCharacterWidth(base + (byte)c);
 				if (w > maxw) {
 					str = last_space;
 					if (str == NULL)
 						return num + (base << 16);
 					break;
 	}
 }
 int GetStringWidth(const char *str)
 {
-	int w = -1;
+	int w = 0;
 	byte c;
 	int base = _stringwidth_base;
+	for (c = *str; c != '\0'; c = *(++str)) {
-	for(;;) {
-		c = *str++;
-		if (c == 0)
-			return w;
 		if (c >= ASCII_LETTERSTART) {
-			w += _stringwidth_table[base + c - ASCII_LETTERSTART];
+			w += GetCharacterWidth(base + c);
 		} else {
 			if (c == ASCII_SETX) str++;
 			else if (c == ASCII_SETXY) str += 2;
 			else if (c == ASCII_TINYFONT) base = 224;
 			else if (c == ASCII_BIGFONT) base = 448;
 		}
 	}
+	return w;
 }
 void DrawFrameRect(int left, int top, int right, int bottom, int ctab, int flags) {
 	byte color_2 = _color_list[ctab].window_color_1a;
 	byte color_interior = _color_list[ctab].window_color_bga;
 		if (c >= ASCII_LETTERSTART) {
 			if (x >= dpi->left + dpi->width) goto skip_char;
 			if (x + 26 >= dpi->left) {
 				GfxMainBlitter(GetSprite(base + 2 + c - ASCII_LETTERSTART), x, y, 1);
 			}
-			x += _stringwidth_table[base + c - ' '];
+			x += GetCharacterWidth(base + c);
 		} else if (c == ASCII_NL) { // newline = {}
 			x = xo;
 			y += 10;
 			if (base != 0) {
 				y -= 4;

changeset 1390	e7cdf3ce0fb6
parent 1357	0a4c07b68673
child 1806	5a55d508c23e