[Scummvm-cvs-logs] SF.net SVN: scummvm:[53519] scummvm/trunk/engines/scumm/charset.cpp
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Fri Oct 15 23:48:46 CEST 2010
Revision: 53519
http://scummvm.svn.sourceforge.net/scummvm/?rev=53519&view=rev
Author: athrxx
Date: 2010-10-15 21:48:46 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
SCUMM/FM-TOWNS: fix display of dialogue options in Indy 4 Japanese
Modified Paths:
--------------
scummvm/trunk/engines/scumm/charset.cpp
Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp 2010-10-15 21:26:05 UTC (rev 53518)
+++ scummvm/trunk/engines/scumm/charset.cpp 2010-10-15 21:48:46 UTC (rev 53519)
@@ -990,8 +990,16 @@
_top += offsY;
_left += offsX;
- if (_left + origWidth / _vm->_textSurfaceMultiplier > _right + 1 || _left < 0) {
- _left += origWidth / _vm->_textSurfaceMultiplier;
+ int boxWidth = origWidth;
+ int boxHeight = origHeight;
+
+ if (is2byte) {
+ boxWidth /= _vm->_textSurfaceMultiplier;
+ boxHeight /= _vm->_textSurfaceMultiplier;
+ }
+
+ if (_left + boxWidth > _right + 1 || _left < 0) {
+ _left += boxWidth;
_top -= offsY;
return;
}
@@ -1029,7 +1037,7 @@
printCharIntern(is2byte, charPtr, origWidth, origHeight, width, height, vs, ignoreCharsetMask);
- _left += origWidth / _vm->_textSurfaceMultiplier;
+ _left += boxWidth;
if (_str.right < _left) {
_str.right = _left;
@@ -1037,8 +1045,8 @@
_str.right++;
}
- if (_str.bottom < _top + height / _vm->_textSurfaceMultiplier)
- _str.bottom = _top + height / _vm->_textSurfaceMultiplier;
+ if (_str.bottom < _top + boxHeight)
+ _str.bottom = _top + boxHeight;
_top -= offsY;
}
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