aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel/tinsel.cpp
diff options
context:
space:
mode:
authorMax Horn2008-08-30 21:03:15 +0000
committerMax Horn2008-08-30 21:03:15 +0000
commit396d815e15403afc5938c1b619e2876bda7259ff (patch)
tree64cfa9cb719859d1f8f10c173266ee759ab93e41 /engines/tinsel/tinsel.cpp
parent2e9bdfb3b11ef15339a7eb5bd5a2d7df1224137d (diff)
downloadscummvm-rg350-396d815e15403afc5938c1b619e2876bda7259ff.tar.gz
scummvm-rg350-396d815e15403afc5938c1b619e2876bda7259ff.tar.bz2
scummvm-rg350-396d815e15403afc5938c1b619e2876bda7259ff.zip
TINSEL: Added support for the 3,4 and 5 FLAGS (multi lingual) versions of DW (only 4 flags version has been tested; see also bug #2048383)
svn-id: r34210
Diffstat (limited to 'engines/tinsel/tinsel.cpp')
-rw-r--r--engines/tinsel/tinsel.cpp23
1 files changed, 3 insertions, 20 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 2df72591a0..1d145a3cc7 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -207,7 +207,7 @@ void KeyboardProcess(CORO_PARAM, const void *) {
int sceneOffset = (_vm->getFeatures() & GF_SCNFILES) ? 1 : 0;
int sceneNumber = (GetSceneHandle() >> SCNHANDLE_SHIFT) - sceneOffset;
#if 0 // FIXME: Disabled this code for now, as it doesn't work as it should (see bug #2078922).
- if ((language == TXT_GERMAN) &&
+ if ((g_language == TXT_GERMAN) &&
((sceneNumber >= 25 && sceneNumber <= 27) || (sceneNumber == 17))) {
// Skip to title screen
// It seems the German CD version uses scenes 25,26,27,17 for the intro,
@@ -695,25 +695,8 @@ int TinselEngine::init() {
// TODO: More stuff from dos_main.c may have to be added here
- // Set language - we'll be clever here and use the ScummVM language setting
- language = TXT_ENGLISH;
- switch (getLanguage()) {
- case Common::FR_FRA:
- language = TXT_FRENCH;
- break;
- case Common::DE_DEU:
- language = TXT_GERMAN;
- break;
- case Common::IT_ITA:
- language = TXT_ITALIAN;
- break;
- case Common::ES_ESP:
- language = TXT_SPANISH;
- break;
- default:
- language = TXT_ENGLISH;
- }
- ChangeLanguage(language);
+ // load in text strings
+ ChangeLanguage(g_language);
// load in graphics info
SetupHandleTable();