thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last commit should have been made simon1 only

Browse source 
svn-id: r8325
This commit is contained in:
Travis Howell 2003-06-05 13:21:03 +00:00
parent 33dceea477
commit ceb1a34b05
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
simon/items.cpp
View file

@ -995,10 +995,17 @@ int SimonEngine::runScript() {
if (_game & GF_TALKIE) if (_game & GF_TALKIE)
d = _array_4[a]; d = _array_4[a];
if (d != 0) if (_game & GF_SIMON2) {
talk_with_speech(d, b); if (d != 0 && !_subtitles)
if (s != NULL && (d == 0 || _subtitles)) talk_with_speech(d, b);
talk_with_text(b, c, s, tv->a, tv->b, tv->c); else if (s != NULL)
talk_with_text(b, c, s, tv->a, tv->b, tv->c);
} else {
if (d != 0)
talk_with_speech(d, b);
if (s != NULL && _subtitles)
talk_with_text(b, c, s, tv->a, tv->b, tv->c);
}
} }
break; break;
@ -1286,7 +1293,8 @@ void SimonEngine::o_inventory_descriptions() {
} }
} }
talk_with_speech(var200, a); if (!_subtitles)
talk_with_speech(var200, a);
} }
} }

2
simon/simon.cpp
View file

@ -2054,7 +2054,7 @@ void SimonEngine::o_print_str() {
case GAME_SIMON2TALKIE: case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN: case GAME_SIMON2WIN:
case GAME_SIMON2MAC: case GAME_SIMON2MAC:
if (speech_id != 0 && num_1 == 1) if (speech_id != 0 && num_1 == 1 && !_subtitles)
talk_with_speech(speech_id, num_1); talk_with_speech(speech_id, num_1);
if (speech_id != 0 && !_subtitles) if (speech_id != 0 && !_subtitles)