[Scummvm-cvs-logs] SF.net SVN: scummvm: [26559] scummvm/trunk/engines/scumm/string.cpp

[sev at users.sourceforge.net]

Revision: 26559
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26559&view=rev
Author:   sev
Date:     2007-04-21 14:31:53 -0700 (Sat, 21 Apr 2007)

Log Message:
-----------
Slighty modified patch #1661777: "SCUMM: allow non-english DIG and COMI 
to be set to English"

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2007-04-21 21:29:52 UTC (rev 26558)
+++ scummvm/trunk/engines/scumm/string.cpp	2007-04-21 21:31:53 UTC (rev 26559)
@@ -1230,6 +1230,14 @@
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.