(svn r15824) -Fix: determine the actual length of the strings to draw in the viewport

1 files changed, 6 insertions, 2 deletions

diff --git a/src/viewport.cpp b/src/viewport.cpp
index 666708b71..2ee1726e3 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1460,11 +1460,15 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDrawVect
 
 		/* The maximum width of the string */
 		int w = GB(ss->width, 0, 15);
-		if (w == 0) w = UINT16_MAX;
+		if (w == 0) {
+			char buffer[DRAW_STRING_BUFFER];
+			GetString(buffer, ss->string, lastof(buffer));
+			w = GetStringBoundingBox(buffer).width;
+		}
 
 		DrawString(
 			UnScaleByZoom(ss->x, zoom), UnScaleByZoom(ss->x, zoom) + w, UnScaleByZoom(ss->y, zoom) - (ss->width & 0x8000 ? 2 : 0),
-			ss->string, colour
+			ss->string, colour, SA_CENTER
 		);
 	}
 }