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

Add warning when voice files are missing in simon2amiga/mac

Browse source 
Work if voice file is missing in simon2amiga/mac

svn-id: r6411
This commit is contained in:
Travis Howell 2003-01-12 02:01:07 +00:00
parent 47fe35819a
commit 93184025d9
3 changed files with 57 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
simon/simon.cpp
View file

@ -90,6 +90,24 @@ static const GameSpecificSettings simon2win_settings = {
"GSPTR30", /* gamepc_filename */
};
static const GameSpecificSettings simon2mac_settings = {
5, /* VGA_DELAY_BASE */
1580 / 4, /* TABLE_INDEX_BASE */
1500 / 4, /* TEXT_INDEX_BASE */
75, /* NUM_VIDEO_OP_CODES */
2000000, /* VGA_MEM_SIZE */
100000, /* TABLES_MEM_SIZE */
1128 / 4, /* MUSIC_INDEX_BASE */
1660 / 4, /* SOUND_INDEX_BASE */
"Simon2.gme", /* gme_filename */
"", /* wav_filename */
"", /* voc_filename */
"SIMON2.MP3", /* mp3_filename */
"", /* voc_effects_filename */
"", /* mp3_effects_filename */
"gsptr30", /* gamepc_filename */
};
static const GameSpecificSettings simon2dos_settings = {
5, /* VGA_DELAY_BASE */
1580 / 4, /* TABLE_INDEX_BASE */
@ -4496,7 +4514,9 @@ void SimonState::go()
_sdl_buf = (byte *)calloc(320 * 200, 1);
_sdl_buf_attached = (byte *)calloc(320 * 200, 1);
if (_game == GAME_SIMON2TALKIE || _game & GAME_SIMON2WIN) {
if (_game == GAME_SIMON2MAC) {
gss = &simon2mac_settings;
} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
gss = &simon2win_settings;
} else if (_game == GAME_SIMON2DOS) {
gss = &simon2dos_settings;
@ -4511,6 +4531,8 @@ void SimonState::go()
setup_vga_file_buf_pointers();
_vk_t_toggle = true;
_sound = new SimonSound(_game, gss, _gameDataPath, _mixer);
loadGamePcFile(gss->gamepc_filename);
@ -4535,7 +4557,7 @@ void SimonState::go()
if (_sound->hasVoice()) {
_vk_t_toggle = false;
} else {
_vk_t_toggle = false;
_vk_t_toggle = true;
}
midi._midi_sfx_toggle = false;