aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
authorTravis Howell2012-04-02 23:08:31 +1000
committerTravis Howell2012-04-02 23:08:31 +1000
commitd50e34c1bd1152170737bea6bd85c08566426eb6 (patch)
tree8424b5961b1bc27a7dde7124b7e00ee3e0314c63 /engines/agos
parentb886bc0a418462dd2bb5c0f0d1cf21f8f109b34b (diff)
downloadscummvm-rg350-d50e34c1bd1152170737bea6bd85c08566426eb6.tar.gz
scummvm-rg350-d50e34c1bd1152170737bea6bd85c08566426eb6.tar.bz2
scummvm-rg350-d50e34c1bd1152170737bea6bd85c08566426eb6.zip
AGOS: Expand fix for bug #3512776 - SIMON1DOS French: Subtitle glitch in introduction.
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/script_s1.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index a81a363845..03aad7ebb9 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -362,10 +362,13 @@ void AGOSEngine_Simon1::os1_screenTextMsg() {
stopAnimateSimon2(2, vgaSpriteId + 2);
}
- // Several strings in the French version of Simon the Sorcerer 1 set the incorrect width,
+ // WORKAROUND: Several strings in the French version of Simon the Sorcerer 1 set the incorrect width,
// causing crashes, or glitches in subtitles. See bug #3512776 for example.
- if (getGameType() == GType_SIMON1 && _language == Common::FR_FRA && stringId == 33245) {
- tl->width = 96;
+ if (getGameType() == GType_SIMON1 && _language == Common::FR_FRA) {
+ if ((getFeatures() & GF_TALKIE) && stringId == 33219)
+ tl->width = 96;
+ if (!(getFeatures() & GF_TALKIE) && stringId == 33245)
+ tl->width = 96;
}
if (stringPtr != NULL && stringPtr[0] != 0 && (speechId == 0 || _subtitles))