libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

added the possibility to interrupt conversations in simon2 as in the original game

Browse Source 
svn-id: r5870
This commit is contained in:
Oliver Kiehl 2002-12-07 17:36:38 +00:00
parent 0ecd439fe1
commit a42d84f01e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
simon/simon.cpp
View File

@ -1133,8 +1133,8 @@ void SimonState::startSubroutine170()
{
Subroutine *sub;
/* XXX: stop speech */
_sound->stopVoice();
sub = getSubroutineByID(170);
if (sub != NULL)
startSubroutineEx(sub);
@ -2475,7 +2475,6 @@ get_out:;
#endif
}
void SimonState::o_wait_for_vga(uint a)
{
_vga_wait_for = a;
@ -2489,6 +2488,12 @@ void SimonState::o_wait_for_vga(uint a)
startSubroutine170();
break;
}
if (_game & GAME_SIMON2) {
if (_vga_wait_for == 200 && !vc_get_bit(14)) {
skip_speech();
break;
}
}
} else {
processSpecialKeys();
}
@ -2509,6 +2514,18 @@ void SimonState::o_wait_for_vga(uint a)
_system->show_mouse(true);
}
void SimonState::skip_speech()
{
_sound->stopVoice();
if (!(_bit_array[1] & 0x1000)) {
_bit_array[0] |= 0x4000;
_variableArray[200] = 5;
start_vga_code(4, 1, 0x1e, 0, 0, 0);
o_wait_for_vga(0x82);
o_unk_99_simon2(2, 1);
}
}
void SimonState::timer_vga_sprites()
{
VgaSprite *vsp;
@ -3761,7 +3778,7 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1)
return;
if (!(_bit_array[0] & 0x4000 || _bit_array[1] & 0x1000)) {
_bit_array[0] |= 0x4000;
_variableArray[200] = 5;
start_vga_code(4, 1, 0x1e, 0, 0, 0);
o_wait_for_vga(0x82);
}

1
simon/simon.h
View File

@ -452,6 +452,7 @@ public:
void o_unk_114();
void o_wait_for_vga(uint a);
void skip_speech();
void o_unk_120(uint a);
void o_unk_126();
void o_unk_127();