From b7c69ba5f05dbadd3ad76d182e54d7e78cc958a2 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Mon, 14 Jul 2008 17:31:41 +0000
Subject: (svn r13699) -Fix: handle SETX(Y) properly when truncating a string
 instead of ignoring it and returning a too long string.

---
 src/gfx.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/gfx.cpp b/src/gfx.cpp
index 2fca52bfe..491112431 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -262,9 +262,13 @@ static int TruncateString(char *str, int maxw)
 				return ddd_w;
 			}
 		} else {
-			if (c == SCC_SETX) str++;
-			else if (c == SCC_SETXY) str += 2;
-			else if (c == SCC_TINYFONT) {
+			if (c == SCC_SETX) {
+				w = *str;
+				str++;
+			} else if (c == SCC_SETXY) {
+				w = *str;
+				str += 2;
+			} else if (c == SCC_TINYFONT) {
 				size = FS_SMALL;
 				ddd = GetCharacterWidth(size, '.') * 3;
 			} else if (c == SCC_BIGFONT) {
-- 
cgit v1.2.3-70-g09d2