[Scummvm-git-logs] scummvm master -> a77c78c5522e24fb48ab15d4b9d3a13a3730c4e4

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a77c78c552 DREAMWEB: Final fixes for Russian version


Commit: a77c78c5522e24fb48ab15d4b9d3a13a3730c4e4
    https://github.com/scummvm/scummvm/commit/a77c78c5522e24fb48ab15d4b9d3a13a3730c4e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-12-09T01:13:23+01:00

Commit Message:
DREAMWEB: Final fixes for Russian version

Changed paths:
    engines/dreamweb/monitor.cpp
    engines/dreamweb/object.cpp


diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index daef8a4c36..e51f393cae 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -345,15 +345,11 @@ void DreamWebEngine::printCurs() {
 	} else
 		height = 8;
 
-	int w = 6;
-	if (getLanguage() == Common::RU_RUS)
-		w = 7;
-
-	multiGet(_textUnder, x, y, w, height);
+	multiGet(_textUnder, x, y, 6, height);
 	++_mainTimer;
 	if ((_mainTimer & 16) == 0)
 		showFrame(_monitorCharset, x, y, '/' - 32, 0);
-	multiDump(x - 6, y, 12, height);
+	multiDump(x - (getLanguage() == Common::RU_RUS ? 7 : 6), y, 12, height);
 }
 
 void DreamWebEngine::delCurs() {
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9191702eee..807d3b3ff1 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -294,9 +294,14 @@ void DreamWebEngine::openOb() {
 
 	copyName(_openedType, _openedOb, commandLine);
 
-	printMessage(kInventx, kInventy+86, 62, 240, false);
+	if (getLanguage() != Common::RU_RUS) {
+		printMessage(kInventx, kInventy+86, 62, 240, false);
 
-	printDirect(commandLine, _lastXPos + 5, kInventy+86, 220, false);
+		printDirect(commandLine, _lastXPos + 5, kInventy+86, 220, false);
+	} else {
+		printDirect(commandLine, kInventx, kInventy+86, 220, false);
+		printMessage(_lastXPos, kInventy+86, 62, 240, false);
+	}
 
 	fillOpen();
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;