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

[sev at users.sourceforge.net]

Revision: 28160
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28160&view=rev
Author:   sev
Date:     2007-07-21 15:57:21 -0700 (Sat, 21 Jul 2007)

Log Message:
-----------
Proper height for Chinese characters, also remove obsolete hack for computing
character base.

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

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2007-07-21 22:40:02 UTC (rev 28159)
+++ scummvm/trunk/engines/scumm/charset.cpp	2007-07-21 22:57:21 UTC (rev 28160)
@@ -82,7 +82,7 @@
 		case Common::ZH_TWN:
 			if (_game.id == GID_CMI) {
 				fontFile = "chinese.fnt";
-				numChar = 12779;
+				numChar = 13630;
 			}
 			break;
 		default:
@@ -105,7 +105,7 @@
 				break;
 			case Common::ZH_TWN:
 				_2byteWidth = 16;
-				_2byteHeight = 16;
+				_2byteHeight = 15;
 				// 0xFE -> 0x21. also compared with 0x0d. perhaps a newline
 				break;
 			default:
@@ -244,11 +244,11 @@
 						high -= 0x62;
 					}
 
-					base += (low * 157 + high) * 30;
+					base += (low * 0x9d + high) * 30;
 				}
 			}
 
-			return _2byteFontPtr + base - 2;
+			return _2byteFontPtr + base;
 			break;
 		}
 	default:


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