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

add some work arounds, to allow simon 1/2 dos talkie to work, even though music and sfx aren't supported.

Browse source 
allow speech in simon 2 dos talkie

svn-id: r5297
This commit is contained in:
Travis Howell 2002-10-24 07:14:28 +00:00
parent a125d1cc1a
commit 33a191b7fd
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
simon/simon.cpp
View file

@ -86,8 +86,8 @@ static const GameSpecificSettings simon2dos_settings = {
1128 / 4, /* MUSIC_INDEX_BASE */ 1128 / 4, /* MUSIC_INDEX_BASE */
1660 / 4, /* SOUND_INDEX_BASE */ 1660 / 4, /* SOUND_INDEX_BASE */
"SIMON2.GME", /* gme_filename */ "SIMON2.GME", /* gme_filename */
NULL, /* wav_filename */ "", /* wav_filename */
NULL, "",
"", "",
"GAME32", /* gamepc_filename */ "GAME32", /* gamepc_filename */
}; };
@ -4720,7 +4720,10 @@ void SimonState::playVoice(uint voice)
_mixer->stop(_voice_sound); _mixer->stop(_voice_sound);
_voice_file->seek(_voice_offsets[voice], SEEK_SET); _voice_file->seek(_voice_offsets[voice], SEEK_SET);
if (!_effects_offsets) { /* WAVE audio */ const char *s2 = gss->wav_filename2;
_music_file = new File();
_music_file->open(s2, _gameDataPath);
if (_music_file->isOpen() == false) { /* WAVE audio */
WaveHeader wave_hdr; WaveHeader wave_hdr;
uint32 data[2]; uint32 data[2];
@ -4806,6 +4809,14 @@ void SimonState::playSound(uint sound)
_mixer->playRaw(&_effects_sound, buffer, size, samples_per_sec, SoundMixer::FLAG_UNSIGNED); _mixer->playRaw(&_effects_sound, buffer, size, samples_per_sec, SoundMixer::FLAG_UNSIGNED);
} else { } else {
/* FIXME: not properly implemented */
/* Simon 1/2 dos talkie sfx aren't supported */
/* Simon 2 dos sfx isn't supported */
const char *s2 = gss->wav_filename2;
_music_file = new File();
_music_file->open(s2, _gameDataPath);
if (_music_file->isOpen() == false) {
byte *p; byte *p;
_mixer->stop(_playing_sound); _mixer->stop(_playing_sound);
@ -4833,6 +4844,7 @@ void SimonState::playSound(uint sound)
_mixer->playRaw(&_playing_sound, p + 8, READ_LE_UINT32(p + 4), 22050, _mixer->playRaw(&_playing_sound, p + 8, READ_LE_UINT32(p + 4), 22050,
SoundMixer::FLAG_UNSIGNED); SoundMixer::FLAG_UNSIGNED);
} }
}
} else { } else {
warning("playSound(%d)", sound); warning("playSound(%d)", sound);
} }
@ -4840,9 +4852,17 @@ void SimonState::playSound(uint sound)
void SimonState::playMusic(uint music) void SimonState::playMusic(uint music)
{ {
midi.shutdown(); warning ("play music point reached");
/* FIXME: not properly implemented */ /* FIXME: not properly implemented */
/* Simon 1/2 dos talkie music aren't supported */
/* Simon 2 dos music isn't supported */
const char *s2 = gss->wav_filename2;
_music_file = new File();
_music_file->open(s2, _gameDataPath);
if (_music_file->isOpen() == false) {
midi.shutdown();
if (_game & GAME_WIN) { if (_game & GAME_WIN) {
_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
File *f = _game_file; File *f = _game_file;
@ -4862,6 +4882,7 @@ void SimonState::playMusic(uint music)
midi.initialize(); midi.initialize();
midi.play(); midi.play();
}
} }
byte *SimonState::dx_lock_2() byte *SimonState::dx_lock_2()

1
simon/simon.h
View file

@ -125,6 +125,7 @@ public:
File *_game_file; File *_game_file;
File *_music_file;
File *_voice_file; File *_voice_file;
uint32 *_voice_offsets; uint32 *_voice_offsets;
File *_effects_file; File *_effects_file;