diff options
| author | Travis Howell | 2003-05-25 03:03:40 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-05-25 03:03:40 +0000 |
| commit | be93277b65f38563f03fa9cc1cb8e6e33385c19e (patch) | |
| tree | 21f3d5e1943a678a7877dc5354e75405a12c3085 /simon/simon.cpp | |
| parent | 6cb28e3d57b2dbcc88d0a0911ab21f15dab19738 (diff) | |
| download | scummvm-rg350-be93277b65f38563f03fa9cc1cb8e6e33385c19e.tar.gz scummvm-rg350-be93277b65f38563f03fa9cc1cb8e6e33385c19e.tar.bz2 scummvm-rg350-be93277b65f38563f03fa9cc1cb8e6e33385c19e.zip | |
Add a few warnings and todos to simon1cd32
svn-id: r7926
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 36db7f22a2..970cb3454c 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1041,10 +1041,12 @@ void SimonState::loadTablesIntoMem(uint subr_id) { readSubroutineBlock(in); closeTablesFile(in); - memcpy(filename, "SFXXXX", 6); - if (_game == GAME_SIMON1WIN) + if (_game == GAME_SIMON1WIN) { + memcpy(filename, "SFXXXX", 6); _sound->readSfxFile(filename, _gameDataPath); - else if (_game & GF_SIMON2) { + } else if (_game == GAME_SIMON1CD32) { + //TODO Add loading of simon1cd32 sound effects and voice files. + } else if (_game & GF_SIMON2) { _sound->loadSfxTable(_game_file, _game_offsets_ptr[atoi(filename + 6) - 1 + gss->SOUND_INDEX_BASE]); } @@ -5296,6 +5298,7 @@ void SimonState::loadMusic (uint music) { // TODO Add support for decruncher } // TODO Add Protracker support for simon1amiga/cd32 + warning("playMusic - Load %dtune attempt", music); } else if (_game & GF_DEMO) { // TODO Add music support for simon1demo } else { |