aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-04-29 12:35:46 +0000
committerTravis Howell2006-04-29 12:35:46 +0000
commitffe434a9494b67d8b92d660a2eeb24a1e571d9f8 (patch)
tree597a355c2ad10e180d5a550b05c230662bd6af79
parent80bc64b9515b567defcd0d6ce7c231f4190d182f (diff)
downloadscummvm-rg350-ffe434a9494b67d8b92d660a2eeb24a1e571d9f8.tar.gz
scummvm-rg350-ffe434a9494b67d8b92d660a2eeb24a1e571d9f8.tar.bz2
scummvm-rg350-ffe434a9494b67d8b92d660a2eeb24a1e571d9f8.zip
Add FF difference in o_screenTextMsg()
svn-id: r22216
-rw-r--r--engines/simon/items.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index e2ad70f774..1ff4907a6c 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1312,8 +1312,10 @@ void SimonEngine::o_screenTextMsg() {
tl = getTextLocation(vgaSpriteId);
if (_speech && speechId != 0)
playSpeech(speechId, vgaSpriteId);
- if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speechId == 0)
+ if (((getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE)) || getGameType() == GType_FF) &&
+ speechId == 0) {
stopAnimateSimon2(2, vgaSpriteId + 2);
+ }
if (string_ptr != NULL && (speechId == 0 || _subtitles))
printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);