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

[athrxx at users.sourceforge.net]

Revision: 45349
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45349&view=rev
Author:   athrxx
Date:     2009-10-23 19:20:59 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
LOL: fixed minor regression

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

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-10-23 19:08:32 UTC (rev 45348)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-10-23 19:20:59 UTC (rev 45349)
@@ -1049,7 +1049,7 @@
 	if (button->arg && !_floatingCursorsEnabled)
 		return 0;
 
-	moveParty((_currentDirection + 1) & 3, ((button->flags2 & 0x1080) == 0x1080) ? 1 : 0, 3, _flags.isTalkie ? 82 : 82);
+	moveParty((_currentDirection + 1) & 3, ((button->flags2 & 0x1080) == 0x1080) ? 1 : 0, 3, _flags.isTalkie ? 84 : 82);
 
 	return 1;
 }

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-23 19:08:32 UTC (rev 45348)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2009-10-23 19:20:59 UTC (rev 45349)
@@ -573,11 +573,13 @@
 
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1) <= _lineCount)
+				// cut off line to leave space for "MORE" button
 				w -= 80;
 		} else {
 			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
 				ct = false;
 			else
+				// cut off line to leave space for "MORE" button
 				w -= 80;
 		}
 
@@ -599,6 +601,7 @@
 	} else {
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1) <= _lineCount)
+				// cut off line to leave space for "MORE" button
 				w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
 
 			w -= _textDimData[sdx].column;


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