[Scummvm-cvs-logs] SF.net SVN: scummvm: [22371] scummvm/trunk/engines/scumm/string.cpp

[fingolfin at users.sourceforge.net]

Revision: 22371
Author:   fingolfin
Date:     2006-05-06 15:49:57 -0700 (Sat, 06 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22371&view=rev

Log Message:
-----------
Fix for bug #1449597 (MANIAC: Incorrect word wrapping)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp
Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2006-05-06 18:10:38 UTC (rev 22370)
+++ scummvm/trunk/engines/scumm/string.cpp	2006-05-06 22:49:57 UTC (rev 22371)
@@ -420,6 +420,7 @@
 		return;
 
 	if (_game.version >= 4 && _game.version <= 6) {
+		// Do nothing while the camera is moving
 		if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x)
 			return;
 	}
@@ -480,7 +481,10 @@
 	if (_talkDelay)
 		return;
 
-	if ((_game.version <= 6 && _haveMsg == 1) || (_game.version == 7 && _haveMsg != 1) || (_game.version == 8 && VAR(VAR_HAVE_MSG))) {
+	if ((_game.version <= 6 && _haveMsg == 1) ||
+	    (_game.version == 7 && _haveMsg != 1) ||
+	    (_game.version == 8 && VAR(VAR_HAVE_MSG))) {
+
 		if (_game.heversion >= 60) {
 			if (_sound->isSoundRunning(1) == 0)
 				stopTalk();
@@ -612,11 +616,11 @@
 			_talkDelay += (int)VAR(VAR_CHARINC);
 		}
 		// Handle line overflow for V3
-		if (_game.version == 3 && _charset->_nextLeft > _screenWidth) {
+		if (_game.version == 3 && _charset->_nextLeft >= _screenWidth) {
 			_charset->_nextLeft = _screenWidth;
 		}
 		// Handle line breaks for V1-V2
-		if (_game.version <= 2 && _charset->_nextLeft > _screenWidth) {
+		if (_game.version <= 2 && _charset->_nextLeft >= _screenWidth) {
 			goto newLine;
 		}
 	}


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