[Scummvm-git-logs] scummvm master -> 203ac1205c6a952102e2fa2e356b6452aaaec209

[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:
203ac1205c DREAMWEB: Fix verb order in Russian DreamWeb


Commit: 203ac1205c6a952102e2fa2e356b6452aaaec209
    https://github.com/scummvm/scummvm/commit/203ac1205c6a952102e2fa2e356b6452aaaec209
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-12-07T01:49:17+01:00

Commit Message:
DREAMWEB: Fix verb order in Russian DreamWeb

Changed paths:
    engines/dreamweb/stubs.cpp


diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a519bf58b8..ef18b93097 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1270,13 +1270,22 @@ void DreamWebEngine::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	const char *command3Fr = "Aller vers";
 	if (command == 3 && getLanguage() == Common::FR_FRA)
 		string = (const uint8 *)command3Fr;
-	printDirect(string, _textAddressX, _textAddressY, textLen, (bool)(textLen & 1));
 
-	copyName(type, index, commandLine);
-	uint16 x = _lastXPos;
-	if (command != 0)
-		x += 5;
-	printDirect(commandLine, x, _textAddressY, textLen, (bool)(textLen & 1));
+	if (getLanguage() != Common::RU_RUS) {
+		printDirect(string, _textAddressX, _textAddressY, textLen, (bool)(textLen & 1));
+
+		copyName(type, index, commandLine);
+
+		uint16 x = _lastXPos;
+		if (command != 0)
+			x += 5;
+		printDirect(commandLine, x, _textAddressY, textLen, (bool)(textLen & 1));
+	} else {
+		copyName(type, index, commandLine);
+		printDirect(commandLine, _textAddressX, _textAddressY, textLen, (bool)(textLen & 1));
+
+		printDirect(string, _lastXPos, _textAddressY, textLen, (bool)(textLen & 1));
+	}
 	_newTextLine = 1;
 }