[Scummvm-cvs-logs] SF.net SVN: scummvm:[54132] scummvm/trunk/engines/kyra/text_lol.cpp

[athrxx at users.sourceforge.net]

Revision: 54132
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54132&view=rev
Author:   athrxx
Date:     2010-11-08 00:08:38 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
LOL: fixed minor text displayer bug

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/text_lol.cpp

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2010-11-07 22:10:29 UTC (rev 54131)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2010-11-08 00:08:38 UTC (rev 54132)
@@ -188,6 +188,7 @@
 	} else {
 		oldDim = _screen->curDimIndex();
 		_screen->setScreenDim(dim);
+		_lineCount = 0;
 		_textDimData[dim].color1 = isPc98 ? 0x33 : 254;
 		_textDimData[dim].color2 = _screen->_curDim->unkA;
 	}
@@ -200,6 +201,7 @@
 	displayText(_dialogueBuffer);
 
 	_screen->setScreenDim(oldDim);
+	_lineCount = 0;
 	_screen->setCurPage(cp);
 	_screen->setFont(of);
 
@@ -246,6 +248,7 @@
 	displayText(_buffer);
 
 	_screen->setScreenDim(od);
+	_lineCount = 0;
 
 	if (!(type & 0x8000)) {
 		if (soundEffect[type])
@@ -376,7 +379,6 @@
 	_tempString2 = 0;
 
 	_currentLine[0] = 0;
-
 	memset(_ctrl, 0, 3);
 
 	char c = parseCommand();
@@ -594,13 +596,13 @@
 			int n2 = 0;
 			int n1 = (w / 4) - 1;
 
-			do {
+			while (n2 < n1 && n2 < s) {
 				c = str[n2];
 				uint8 cu = (uint8) c;
 				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
 					n2++;
 				n2++;
-			} while (n2 < n1 && n2 < s);
+			}
 			s = n2;
 		}
 	} else {


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