[Scummvm-cvs-logs] scummvm master -> e629de317f8c72350c175052014afb55e58a73b6

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e629de317f TOON: Fix logical branch error. CID 1004062


Commit: e629de317f8c72350c175052014afb55e58a73b6
    https://github.com/scummvm/scummvm/commit/e629de317f8c72350c175052014afb55e58a73b6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-29T13:23:45-07:00

Commit Message:
TOON: Fix logical branch error. CID 1004062

Changed paths:
    engines/toon/font.cpp



diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp
index 1e851ff..e26ed92 100644
--- a/engines/toon/font.cpp
+++ b/engines/toon/font.cpp
@@ -116,15 +116,15 @@ void FontRenderer::computeSize(const Common::String &origText, int16 *retX, int1
 	const byte *text = (const byte *)origText.c_str();
 	while (*text) {
 		byte curChar = *text;
-		if (curChar < 32) {
-			text++;
-			continue;
-		} else if (curChar == 13) {
+		if (curChar == 13) {
 			totalWidth = MAX(totalWidth, lineWidth);
 			totalHeight += lineHeight;
 			lineHeight = 0;
 			lineWidth = 0;
 			lastLineHeight = 0;
+		} else if (curChar < 32) {
+			text++;
+			continue;
 		} else {
 			curChar = textToFont(curChar);
 			int16 charWidth = _currentFont->getFrameWidth(curChar) - 1;