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

Switch back to older method (Used in Hebrew version) of combined speech and subtitles for Simon2.

Browse Source 
svn-id: r11847
This commit is contained in:
Travis Howell 2003-12-22 11:08:35 +00:00
parent 1e5496b2c8
commit d668694d66
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
simon/simon.cpp
View File

@ -565,15 +565,19 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
if (!(_game & GF_SIMON2) && _language > 1) {
if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0)
_subtitles = 0;
} else if (_speech)
} else
_subtitles = ConfMan.getBool("subtitles");
// Make sure either speech or subtitles is enabled
if ((_game & GF_TALKIE) && !_speech && !_subtitles)
_subtitles = 1;
if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0)
_fade = 0;
if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
_speed = ConfMan.getInt("slow_down");
_system->init_size(320, 200);
// FIXME Use auto dirty rects cleanup code to reduce CPU usage
@ -4070,10 +4074,12 @@ void SimonEngine::talk_with_speech(uint speech_id, uint vga_sprite_id) {
}
_skip_vga_wait = true;
} else {
if (_subtitles) {
_sound->playVoice(speech_id);
return;
if (_subtitles && _scriptvar_2) {
start_vga_code(4, 2, 5, 0, 0, 0);
o_wait_for_vga(205);
o_kill_sprite_simon2(2,5);
}
o_kill_sprite_simon2(2, vga_sprite_id + 2);
_sound->playVoice(speech_id);
start_vga_code(4, 2, vga_sprite_id + 2, 0, 0, 0);

2
simon/vga.cpp
View File

@ -1785,7 +1785,7 @@ void SimonEngine::vc_63_palette_thing_2() {
void SimonEngine::vc_64_skip_if_no_speech() {
// Simon2
if ((_sound->_voice_handle == 0) || _subtitles)
if (_sound->_voice_handle == 0)
vc_skip_next_instruction();
}