Patch #682981: Experimental translation optimisation (version 2), and

#683384: Smush Regression Workaround

svn-id: r6607

1 files changed, 6 insertions, 0 deletions

diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp
index cdce084e00..8024704485 100644
--- a/scumm/smush/player.cpp
+++ b/scumm/smush/player.cpp
@@ -486,6 +486,12 @@ void SmushPlayer::handleTextResource(Chunk & b) {
 		g_scumm->translateText((byte*)str - 1, g_scumm->_transText);
 		while(*str++ != '/');
 		string2 = (char*)g_scumm->_transText;
+
+		// If string2 contains formatting information there probably
+		// wasn't any translation for it in the language.tab file. In
+		// that case, pretend there is no string2.
+		if (string2[0] == '^')
+			string2[0] = 0;
 	}
 
 	while(str[0] == '^') {