diff options
| author | BLooperZ | 2018-10-01 16:05:10 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2020-01-01 00:31:21 +0100 |
| commit | e4d70141f010192fd36eb1aaf0ea31721df1dce5 (patch) | |
| tree | 39d7ba3c77d3b91e7f9d297e98252dc5bd1697b9 /engines/scumm | |
| parent | 68c6038e9c6e12d9b38b192364b330b5c50f244b (diff) | |
| download | scummvm-rg350-e4d70141f010192fd36eb1aaf0ea31721df1dce5.tar.gz scummvm-rg350-e4d70141f010192fd36eb1aaf0ea31721df1dce5.tar.bz2 scummvm-rg350-e4d70141f010192fd36eb1aaf0ea31721df1dce5.zip | |
SCUMM: better locale check
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/string.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 09684a0d84..4747bd765e 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -437,7 +437,7 @@ bool ScummEngine::newLine() { _nextLeft -= _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) / 2; if (_nextLeft < 0) _nextLeft = _game.version >= 6 ? _string[0].xpos : 0; - } else if (_game.version >= 4 && true /*IS_HEBREW*/) { + } else if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) { _nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft; } @@ -602,7 +602,7 @@ void ScummEngine::CHARSET_1() { _nextLeft -= _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) / 2; if (_nextLeft < 0) _nextLeft = _game.version >= 6 ? _string[0].xpos : 0; - } else if (_game.version >= 4 && true /*IS_HEBREW*/) { + } else if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) { _nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft; } @@ -610,7 +610,7 @@ void ScummEngine::CHARSET_1() { int c = 0; - if (_game.version >= 4 && true /*IS_HEBREW*/) { + if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) { int ll = 0; char* ltext = (char*)_charsetBuffer + _charsetBufPos; while (ltext[ll] == -1) { @@ -1062,7 +1062,7 @@ void ScummEngine::drawString(int a, const byte *msg) { if (_charset->_center) { _charset->_left -= _charset->getStringWidth(a, buf) / 2; - } else if (_game.version >= 4 && true /*IS_HEBREW*/) { + } else if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) { if (_charset->getStringWidth(a, buf) > _screenWidth) { int ll = 0; byte* ltext = buf; @@ -1125,7 +1125,7 @@ void ScummEngine::drawString(int a, const byte *msg) { case 8: if (_charset->_center) { _charset->_left = _charset->_startLeft - _charset->getStringWidth(a, buf + i); - } else if (_game.version >= 4 && true /*IS_HEBREW*/) { + } else if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) { if (_charset->getStringWidth(a, buf + i) > _screenWidth) { int ll = 0; byte* ltext = buf + i; |