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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Fri Oct 22 21:28:13 CEST 2010


Revision: 53704
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53704&view=rev
Author:   athrxx
Date:     2010-10-22 19:28:12 +0000 (Fri, 22 Oct 2010)

Log Message:
-----------
SCUMM/FM-TOWNS JAPANESE: fix another font spacing issue

(fixes MI1 character talk text)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2010-10-22 18:09:49 UTC (rev 53703)
+++ scummvm/trunk/engines/scumm/charset.cpp	2010-10-22 19:28:12 UTC (rev 53704)
@@ -394,8 +394,8 @@
 			if (spacing) {
 				if (_vm->_game.id == GID_MONKEY) {
 					spacing++;
-					//if (_curId == 2)
-					//	spacing++;
+					if (_curId == 2)
+						spacing++;
 				} else if (_vm->_game.id != GID_INDY4 && _curId == 1) {
 					spacing++;
 				}
@@ -910,7 +910,15 @@
 		charPtr = 0;
 		_vm->_cjkChar = chr;
 		enableShadow(true);
-		origWidth = width = getCharWidth(chr);
+		
+		width = getCharWidth(chr);
+		// For whatever reason MI1 uses a different font width
+		// for alignment calculation and for drawing when
+		// charset 2 is active. This fixes some subtle glitches.
+		if (_vm->_game.id == GID_MONKEY && _curId == 2)
+			width--;
+		origWidth = width;
+
 		origHeight = height = getFontHeight();
 		offsX = offsY = 0;
 	} else


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




More information about the Scummvm-git-logs mailing list