[Scummvm-cvs-logs] SF.net SVN: scummvm:[33545] scummvm/branches/branch-0-12-0/engines/scumm

[sev at users.sourceforge.net]

Revision: 33545
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33545&view=rev
Author:   sev
Date:     2008-08-02 21:37:31 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Backport fix for bug #2023727: "MONKEY2: Misplaced Text"

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/scumm/charset.cpp
    scummvm/branches/branch-0-12-0/engines/scumm/string.cpp

Modified: scummvm/branches/branch-0-12-0/engines/scumm/charset.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/scumm/charset.cpp	2008-08-02 21:36:08 UTC (rev 33544)
+++ scummvm/branches/branch-0-12-0/engines/scumm/charset.cpp	2008-08-02 21:37:31 UTC (rev 33545)
@@ -49,7 +49,7 @@
 	Common::File fp;
 	_useCJKMode = false;
 	_textSurfaceMultiplier = 1;
-	_newLineCharacter = 0xfe;
+	_newLineCharacter = 0;
 
 	if (_game.version <= 5 && _game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) { // FM-TOWNS v3 / v5 Kanji
 		int numChar = 256 * 32;

Modified: scummvm/branches/branch-0-12-0/engines/scumm/string.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/scumm/string.cpp	2008-08-02 21:36:08 UTC (rev 33544)
+++ scummvm/branches/branch-0-12-0/engines/scumm/string.cpp	2008-08-02 21:37:31 UTC (rev 33545)
@@ -279,7 +279,7 @@
 		}
 		c = *buffer++;
 
-		if (c == _newLineCharacter) {
+		if (_newLineCharacter != 0 && c == _newLineCharacter) {
 			c = 13;
 			break;
 		}


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