diff options
| author | Travis Howell | 2006-04-07 03:30:52 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-07 03:30:52 +0000 |
| commit | e806e891e3a0f3675e567271e371ff8d760a63d7 (patch) | |
| tree | 2fe518689ce2e9a22f70201f1e5a2b97ee4ceea6 | |
| parent | 50983a3721dbd7c0cfee08cf9b7cac4d81588c27 (diff) | |
| download | scummvm-rg350-e806e891e3a0f3675e567271e371ff8d760a63d7.tar.gz scummvm-rg350-e806e891e3a0f3675e567271e371ff8d760a63d7.tar.bz2 scummvm-rg350-e806e891e3a0f3675e567271e371ff8d760a63d7.zip | |
Sprite is always set to 1 in o_printStr() and o1_scnTxtLongText() for FF. Fixes wait timeouts in holomail.
svn-id: r21660
| -rw-r--r-- | engines/simon/items.cpp | 6 | ||||
| -rw-r--r-- | engines/simon/simon.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 5a9612fe9e..30fefaca7f 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1246,12 +1246,16 @@ void SimonEngine::o1_scnTxtLongText(bool &cond, int &ret) { uint color = getVarOrByte(); uint stringId = getVarOrByte(); uint speechId = 0; + TextLocation *tl; const char *string_ptr = (const char *)getStringPtrByID(_stringIdArray3[stringId]); - TextLocation *tl = getTextLocation(vgaSpriteId); if (getFeatures() & GF_TALKIE) speechId = _speechIdArray4[stringId]; + if (getGameType() == GType_FF) + vgaSpriteId = 1; + tl = getTextLocation(vgaSpriteId); + if (_speech && speechId != 0) playSpeech(speechId, vgaSpriteId); if (string_ptr != NULL && _subtitles) diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 39b75609f9..27bf2c442d 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -2143,10 +2143,9 @@ void SimonEngine::o_printStr() { speech_id = (uint16)getNextWord(); if (getGameType() == GType_FF) - tl = getTextLocation(1); - else - tl = getTextLocation(vgaSpriteId); + vgaSpriteId = 1; + tl = getTextLocation(vgaSpriteId); if (_speech && speech_id != 0) playSpeech(speech_id, vgaSpriteId); if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0) |