[Scummvm-cvs-logs] SF.net SVN: scummvm:[45126] scummvm/trunk/engines/sci/gui/gui_gfx.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 45126
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45126&view=rev
Author:   m_kiewitz
Date:     2009-10-15 18:00:28 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
SCI/newgui: Do textcodeprocessing only for SCI1.1+

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-15 15:27:08 UTC (rev 45125)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-15 18:00:28 UTC (rev 45126)
@@ -387,8 +387,10 @@
 		curChar = *text++;
 		switch (curChar) {
 		case 0x7C:
-			curCharCount++;
-			curCharCount += TextCodeProcessing(text, orgFontId, oldPenColor);
+			if (getSciVersion() >= SCI_VERSION_1_1) {
+				curCharCount++;
+				curCharCount += TextCodeProcessing(text, orgFontId, oldPenColor);
+			}
 			continue;
 
 		case 0xD:
@@ -427,13 +429,15 @@
 		while (len--) {
 			curChar = *text++;
 			switch (curChar) {
-			case 0x7C:
-				len -= TextCodeProcessing(text, orgFontId, 0);
-				break;
 			case 0x0A:
 			case 0x0D:
 				textHeight = MAX<int16> (textHeight, _curPort->fontHeight);
 				break;
+			case 0x7C:
+				if (getSciVersion() >= SCI_VERSION_1_1) {
+					len -= TextCodeProcessing(text, orgFontId, 0);
+					break;
+				}
 			default:
 				textHeight = MAX<int16> (textHeight, _curPort->fontHeight);
 				textWidth += _font->getCharWidth(curChar);
@@ -505,15 +509,15 @@
 	while (len--) {
 		curChar = (*text++);
 		switch (curChar) {
-		case 0x7C:
-			len -= TextCodeProcessing(text, orgFontId, orgPenColor);
-			break;
-
 		case 0x0A:
 		case 0x0D:
 		case 0:
 			break;
-
+		case 0x7C:
+			if (getSciVersion() >= SCI_VERSION_1_1) {
+				len -= TextCodeProcessing(text, orgFontId, orgPenColor);
+				break;
+			}
 		default:
 			charWidth = _font->getCharWidth(curChar);
 			// clear char


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.