[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.302,1.303

kirben kirben at users.sourceforge.net
Fri Sep 30 01:01:11 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230/scumm

Modified Files:
	string.cpp 
Log Message:

Handle overflow like original SCUMM3 games.
Should fix bug #1306269


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- string.cpp	30 Sep 2005 07:31:14 -0000	1.302
+++ string.cpp	30 Sep 2005 08:00:12 -0000	1.303
@@ -429,7 +429,11 @@
 			} else
 				_talkDelay += (int)VAR(VAR_CHARINC);
 
-			// Handle line breaks for V1-V3
+			// Handle line overflow for V3
+			if (_version == 3 && _charset->_nextLeft > _screenWidth) {
+				_charset->_nextLeft = _screenWidth;
+			}
+			// Handle line breaks for V1-V2
 			if (_version <= 2 && _charset->_nextLeft > _screenWidth) {
 				goto newLine;
 			}





More information about the Scummvm-git-logs mailing list