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

[athrxx at users.sourceforge.net]

Revision: 45276
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45276&view=rev
Author:   athrxx
Date:     2009-10-20 18:34:12 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
LOL/PC-98: fixed glitch in text displayer

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

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-20 16:55:12 UTC (rev 45275)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-20 18:34:12 UTC (rev 45276)
@@ -540,7 +540,7 @@
 	int sdx = _screen->curDimIndex();
 	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
 
-	int fh = (_screen->getFontHeight() + _screen->_charOffset);
+	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
 	int lines = (sd->h - _screen->_charOffset) / fh;
 
 	while (_textDimData[sdx].line >= lines) {
@@ -571,11 +571,14 @@
 	if (pc98PrintFlag) {
 		bool ct = true;
 
-		if ((lw + _textDimData[sdx].column) <= w) {
+		if ((lw + _textDimData[sdx].column) > w) {
+			if ((lines - 1) <= _lineCount)
+				w -= 80;
+		} else {
 			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
 				ct = false;
 			else
-				w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
+				w -= 80;
 		}
 
 		if (ct) {


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