aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorBLooperZ2019-12-30 22:25:04 +0200
committerEugene Sandulenko2020-01-01 00:31:21 +0100
commit2105313d8b074e0556187dfeb6d5e1f497bc0b7d (patch)
treeffbe52bd8726c7479ffbbfd2766d86f3d28cb99e /engines/scumm
parent800ea6fb15d6fab3c6ecefdb3e33613aa94d58f0 (diff)
downloadscummvm-rg350-2105313d8b074e0556187dfeb6d5e1f497bc0b7d.tar.gz
scummvm-rg350-2105313d8b074e0556187dfeb6d5e1f497bc0b7d.tar.bz2
scummvm-rg350-2105313d8b074e0556187dfeb6d5e1f497bc0b7d.zip
SCUMM: remove forced right-to-left mode
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/smush/smush_font.cpp2
-rw-r--r--engines/scumm/string.cpp14
-rw-r--r--engines/scumm/verbs.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp
index de9a183bce..93945d9e2f 100644
--- a/engines/scumm/smush/smush_font.cpp
+++ b/engines/scumm/smush/smush_font.cpp
@@ -192,7 +192,7 @@ void SmushFont::drawSubstring(const char *str, byte *buffer, int dst_width, int
if (x < 0)
x = 0;
- if (_vm->_language == Common::HE_ISR || true) {
+ if (_vm->_language == Common::HE_ISR) {
for (int i = strlen(str); i >= 0; i--) {
x += drawChar(buffer, dst_width, x, y, str[i]);
}
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index a71b65fa54..bbbb7d2a06 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -153,7 +153,7 @@ void ScummEngine_v6::drawBlastTexts() {
_charset->_disableOffsX = _charset->_firstChar = true;
_charset->setCurID(_blastTextQueue[i].charset);
- if (_game.version >= 7 && (_language == Common::HE_ISR || true)) {
+ if (_game.version >= 7 && _language == Common::HE_ISR) {
fakeBidiString((char *)buf, false);
}
@@ -439,7 +439,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 && _game.version < 7 && (_language == Common::HE_ISR || true)) {
+ } else if (_game.version >= 4 && _game.version < 7 && _language == Common::HE_ISR) {
if (_game.id == GID_MONKEY && _charset->getCurID() == 4) {
_nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft;
}
@@ -687,7 +687,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 && _game.version < 7 && (_language == Common::HE_ISR || true)) {
+ } else if (_game.version >= 4 && _game.version < 7 && _language == Common::HE_ISR) {
if (_game.id == GID_MONKEY && _charset->getCurID() == 4) {
_nextLeft = _screenWidth - _charset->getStringWidth(0, _charsetBuffer + _charsetBufPos) - _nextLeft;
}
@@ -697,7 +697,7 @@ void ScummEngine::CHARSET_1() {
int c = 0;
- if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) {
+ if (_game.version >= 4 && _game.version < 7 && _language == Common::HE_ISR) {
fakeBidiString((char *)_charsetBuffer + _charsetBufPos, true);
}
@@ -970,7 +970,7 @@ void ScummEngine::drawString(int a, const byte *msg) {
convertMessageToString(msg, buf, sizeof(buf));
- if (_game.version >= 4 && _game.version < 7 && (_language == Common::HE_ISR || true)) {
+ if (_game.version >= 4 && _game.version < 7 && _language == Common::HE_ISR) {
fakeBidiString((char *)buf, false);
}
@@ -1033,7 +1033,7 @@ void ScummEngine::drawString(int a, const byte *msg) {
if (_charset->_center) {
_charset->_left -= _charset->getStringWidth(a, buf) / 2;
- } else if (_game.version >= 4 && _game.version < 7 && _game.id != GID_SAMNMAX && (_language == Common::HE_ISR || true)) {
+ } else if (_game.version >= 4 && _game.version < 7 && _game.id != GID_SAMNMAX && _language == Common::HE_ISR) {
if (_game.id != GID_INDY4 || buf[0] == 127) {
int ll = 0;
if (_game.id == GID_INDY4 && buf[0] == 127) {
@@ -1098,7 +1098,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 && _game.version < 7 && (_language == Common::HE_ISR || true)) {
+ } else if (_game.version >= 4 && _game.version < 7 && _language == Common::HE_ISR) {
int ll = 0;
byte* ltext = buf + i;
while (ltext[ll] == 0xFF) {
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 2e2b2879d6..aef02b3878 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -1013,7 +1013,7 @@ void ScummEngine_v7::drawVerb(int verb, int mode) {
_charset->setCurID(vs->charset_nr);
// Compute the text rect
- if ((_language == Common::HE_ISR || true)/* && !(_game.id == GID_FT && (_charset->getCurID() == 6 || _charset->getCurID() == 7))*/) {
+ if (_language == Common::HE_ISR /* && !(_game.id == GID_FT && (_charset->getCurID() == 6 || _charset->getCurID() == 7))*/) {
vs->curRect.left = _screenWidth - _charset->getStringWidth(0, buf);
}
vs->curRect.right = 0;