libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set midi vars to -1 by default to prevent simon2dos trying to load music during copy protection

Browse Source 
Correct vc_62 so it is closer to diasm.

svn-id: r7780
This commit is contained in:
Travis Howell 2003-05-21 11:49:41 +00:00
parent c062b73422
commit 1294eb35c7
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simon/simon.cpp
View File

@ -322,8 +322,8 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst)
_video_var_9 = 0;
_midi_sfx = 0;
_last_music_played = 0;
_next_music_to_play = 0;
_last_music_played = -1;
_next_music_to_play = -1;
_show_preposition = 0;
_showmessage_flag = 0;

101
simon/vga.cpp
View File

@ -1691,62 +1691,63 @@ void SimonState::vc_62_palette_thing() {
vc_29_stop_all_sounds();
if (!_video_var_3) {
if (_game & GF_SIMON2) {
if (_next_music_to_play != -1)
loadMusic(_next_music_to_play);
}
} else
_video_var_3 = true;
_video_num_pal_colors = 256;
if (_video_palette_mode == 4)
_video_num_pal_colors = 208;
_video_num_pal_colors = 256;
if (_video_palette_mode == 4)
_video_num_pal_colors = 208;
memcpy(_video_buf_1, _palette_backup, _video_num_pal_colors * sizeof(uint32));
for (i = NUM_PALETTE_FADEOUT; i != 0; --i) {
palette_fadeout((uint32 *)_video_buf_1, _video_num_pal_colors);
_system->set_palette(_video_buf_1, 0, _video_num_pal_colors);
_system->update_screen();
delay(5);
}
if (!(_game & GF_SIMON2)) {
uint16 params[5]; /* parameters to vc_10_draw */
VgaSprite *vsp;
VgaPointersEntry *vpe;
vsp = _vga_sprites;
while (vsp->id != 0) {
if (vsp->id == 128) {
byte *f1 = _cur_vga_file_1;
byte *f2 = _cur_vga_file_2;
uint palmode = _video_palette_mode;
vpe = &_vga_buffer_pointers[vsp->unk7];
_cur_vga_file_1 = vpe->vgaFile1;
_cur_vga_file_2 = vpe->vgaFile2;
_video_palette_mode = vsp->unk6;
params[0] = READ_BE_UINT16_UNALIGNED(&vsp->image);
params[1] = READ_BE_UINT16_UNALIGNED(&vsp->base_color);
params[2] = READ_BE_UINT16_UNALIGNED(&vsp->x);
params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte *)params;
vc_10_draw();
_video_palette_mode = palmode;
_cur_vga_file_1 = f1;
_cur_vga_file_2 = f2;
break;
}
vsp++;
memcpy(_video_buf_1, _palette_backup, _video_num_pal_colors * sizeof(uint32));
for (i = NUM_PALETTE_FADEOUT; i != 0; --i) {
palette_fadeout((uint32 *)_video_buf_1, _video_num_pal_colors);
_system->set_palette(_video_buf_1, 0, _video_num_pal_colors);
_system->update_screen();
delay(5);
}
if (!(_game & GF_SIMON2)) {
uint16 params[5]; /* parameters to vc_10_draw */
VgaSprite *vsp;
VgaPointersEntry *vpe;
vsp = _vga_sprites;
while (vsp->id != 0) {
if (vsp->id == 128) {
byte *f1 = _cur_vga_file_1;
byte *f2 = _cur_vga_file_2;
uint palmode = _video_palette_mode;
vpe = &_vga_buffer_pointers[vsp->unk7];
_cur_vga_file_1 = vpe->vgaFile1;
_cur_vga_file_2 = vpe->vgaFile2;
_video_palette_mode = vsp->unk6;
params[0] = READ_BE_UINT16_UNALIGNED(&vsp->image);
params[1] = READ_BE_UINT16_UNALIGNED(&vsp->base_color);
params[2] = READ_BE_UINT16_UNALIGNED(&vsp->x);
params[3] = READ_BE_UINT16_UNALIGNED(&vsp->y);
params[4] = READ_BE_UINT16_UNALIGNED(&vsp->unk4);
_vc_ptr = (byte *)params;
vc_10_draw();
_video_palette_mode = palmode;
_cur_vga_file_1 = f1;
_cur_vga_file_2 = f2;
break;
}
vsp++;
}
}
dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200);
_vc_ptr = vc_ptr_org;
}
if (_game & GF_SIMON2) {
if (_next_music_to_play != -1)
loadMusic(_next_music_to_play);
}
dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200);
_vc_ptr = vc_ptr_org;
}
void SimonState::vc_63_palette_thing_2() {