[Scummvm-git-logs] scummvm master -> 4e2122cff2c920233bdc5e2beff5a8a245c1856e

[athrxx]

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:
4e2122cff2 SCUMM: Revert 873efee47ffc540a4f5af02a746811fb6b5d88ee


Commit: 4e2122cff2c920233bdc5e2beff5a8a245c1856e
    https://github.com/scummvm/scummvm/commit/4e2122cff2c920233bdc5e2beff5a8a245c1856e
Author: athrxx (athrxx at scummvm.org)
Date: 2020-12-02T19:45:06+01:00

Commit Message:
SCUMM: Revert 873efee47ffc540a4f5af02a746811fb6b5d88ee

The patch no longer works and actually causes slightly incorrect text display in COMI, because the strings in language.tab are not 100% identical with the resource strings.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 5a4c784c7e..9dbb6cbb82 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1628,14 +1628,6 @@ void ScummEngine_v7::loadLanguageBundle() {
 	ScummFile file;
 	int32 size;
 
-	// if game is manually set to English, don't try to load localized text
-	if ((_language == Common::EN_ANY) || (_language == Common::EN_USA) || (_language == Common::EN_GRB)) {
-		warning("Language file is forced to be ignored");
-
-		_existLanguageFile = false;
-		return;
-	}
-
 	if (_game.id == GID_DIG) {
 		openFile(file, "language.bnd");
 	} else if (_game.id == GID_CMI) {