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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Thu Dec 4 20:42:42 CET 2008


Revision: 35243
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35243&view=rev
Author:   drmccoy
Date:     2008-12-04 19:42:42 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
This should make the US version work

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

Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp	2008-12-04 19:24:25 UTC (rev 35242)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp	2008-12-04 19:42:42 UTC (rev 35243)
@@ -1261,6 +1261,11 @@
 		cd = GetCurrentCD();
 		assert((cd == 1) || (cd == 2));
 		assert(((unsigned int) lang) < NUM_LANGUAGES);
+
+		if (lang == TXT_ENGLISH)
+			if (_vm->getLanguage() == Common::EN_USA)
+				lang = TXT_US;
+
 	} else {
 		cd = 0;
 		lang = TXT_ENGLISH;
@@ -1276,6 +1281,11 @@
 		cd = GetCurrentCD();
 		assert((cd == 1) || (cd == 2));
 		assert(((unsigned int) lang) < NUM_LANGUAGES);
+
+		if (lang == TXT_ENGLISH)
+			if (_vm->getLanguage() == Common::EN_USA)
+				lang = TXT_US;
+
 	} else {
 		cd = 0;
 		lang = TXT_ENGLISH;
@@ -1292,6 +1302,11 @@
 	if (TinselV2) {
 		cd = GetCurrentCD();
 		assert((cd == 1) || (cd == 2));
+
+		if (lang == TXT_ENGLISH)
+			if (_vm->getLanguage() == Common::EN_USA)
+				lang = TXT_US;
+
 	} else
 		cd = 0;
 


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




More information about the Scummvm-git-logs mailing list