[Scummvm-cvs-logs] SF.net SVN: scummvm: [28238] scummvm/trunk/engines/gob/gob.cpp

[drmccoy at users.sourceforge.net]

Revision: 28238
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28238&view=rev
Author:   drmccoy
Date:     2007-07-27 09:23:06 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
Clarifying the language fallback warnings

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2007-07-27 13:05:24 UTC (rev 28237)
+++ scummvm/trunk/engines/gob/gob.cpp	2007-07-27 16:23:06 UTC (rev 28238)
@@ -121,9 +121,16 @@
 
 void GobEngine::validateLanguage() {
 	if (_vm->_global->_languageWanted != _vm->_global->_language) {
-		warning("Your game version doesn't support the requested language");
-		warning("Using the first language available: %s",
-				getLangDesc(_vm->_global->_language));
+		warning("Your game version doesn't support the requested language %s",
+				getLangDesc(_vm->_global->_languageWanted));
+
+		if (((_vm->_global->_languageWanted == 2) && (_vm->_global->_language == 5)) ||
+		    ((_vm->_global->_languageWanted == 5) && (_vm->_global->_language == 2)))
+			warning("Using %s instead", getLangDesc(_vm->_global->_language));
+		else
+			warning("Using the first language available: %s",
+					getLangDesc(_vm->_global->_language));
+
 		_vm->_global->_languageWanted = _vm->_global->_language;
 	}
 }


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