libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sprite is always set to 1 in o_printStr() and o1_scnTxtLongText() for FF. Fixes wait timeouts in holomail.

Browse Source 
svn-id: r21660
This commit is contained in:
Travis Howell 2006-04-07 03:30:52 +00:00
parent 50983a3721
commit e806e891e3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/simon/items.cpp
View File

@ -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)

5
engines/simon/simon.cpp
View File

@ -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)