[Scummvm-cvs-logs] scummvm master -> 744f8507d714da5710c020bf56aa49dd0662acf6

eriktorbjorn eriktorbjorn at telia.com
Fri Oct 14 00:00:53 CEST 2011


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:
744f8507d7 TINSEL: Fix #3422433 ("DW2: US version uses UK graphics")


Commit: 744f8507d714da5710c020bf56aa49dd0662acf6
    https://github.com/scummvm/scummvm/commit/744f8507d714da5710c020bf56aa49dd0662acf6
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2011-10-13T14:48:09-07:00

Commit Message:
TINSEL: Fix #3422433 ("DW2: US version uses UK graphics")

According to dreammaster it should be enough to add cases for the
US version in these two functions, but unfortunately he can't test
it himself. I guess I should try to find the time to play through
the game, but right now there's an annoying DW2 regression from
commit d5690e0. See GitHub commit note for details.

Changed paths:
    NEWS
    engines/tinsel/config.cpp



diff --git a/NEWS b/NEWS
index 029d515..3c8597e 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,8 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Tinsel:
    - Fixed a regression that made Discworld uncompletable.
+   - The US version of Discworld II now shows the correct title screen and
+     language flag.
 
  SAGA:
    - Fixed a regression in Inherit the Earth's dragon walk code which
diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp
index fd278db..0505730 100644
--- a/engines/tinsel/config.cpp
+++ b/engines/tinsel/config.cpp
@@ -76,6 +76,9 @@ void Config::writeToDisk() {
 		case TXT_ITALIAN:
 			lang = Common::IT_ITA;
 			break;
+		case TXT_US:
+			lang = Common::EN_USA;
+			break;
 		default:
 			lang = Common::EN_ANY;
 		}
@@ -132,6 +135,9 @@ void Config::readFromDisk() {
 	case Common::IT_ITA:
 		_language = TXT_ITALIAN;
 		break;
+	case Common::EN_USA:
+		_language = TXT_US;
+		break;
 	default:
 		_language = TXT_ENGLISH;
 	}






More information about the Scummvm-git-logs mailing list