[Scummvm-cvs-logs] scummvm master -> d50e34c1bd1152170737bea6bd85c08566426eb6
Kirben
kirben at optusnet.com.au
Mon Apr 2 15:10:07 CEST 2012
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:
d50e34c1bd AGOS: Expand fix for bug #3512776 - SIMON1DOS French: Subtitle glitch in introduction.
Commit: d50e34c1bd1152170737bea6bd85c08566426eb6
https://github.com/scummvm/scummvm/commit/d50e34c1bd1152170737bea6bd85c08566426eb6
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2012-04-02T06:08:31-07:00
Commit Message:
AGOS: Expand fix for bug #3512776 - SIMON1DOS French: Subtitle glitch in introduction.
Changed paths:
engines/agos/script_s1.cpp
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index a81a363..03aad7e 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))
More information about the Scummvm-git-logs
mailing list