diff options
| author | Filippos Karapetis | 2007-07-31 21:57:32 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-07-31 21:57:32 +0000 |
| commit | 6b590bf4d14a0f0d3024d85b9a6220956e131d23 (patch) | |
| tree | f7bae32b24730b048edb58487b16c4f9a08305be /engines/saga | |
| parent | 9bdbb470c031273a56a519de5e13136ad846a22e (diff) | |
| download | scummvm-rg350-6b590bf4d14a0f0d3024d85b9a6220956e131d23.tar.gz scummvm-rg350-6b590bf4d14a0f0d3024d85b9a6220956e131d23.tar.bz2 scummvm-rg350-6b590bf4d14a0f0d3024d85b9a6220956e131d23.zip | |
Fixed incorrect file assignment for the ITE Windows demo
svn-id: r28372
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/rscfile.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp index 3a60ae60e6..126cb58344 100644 --- a/engines/saga/rscfile.cpp +++ b/engines/saga/rscfile.cpp @@ -435,7 +435,7 @@ bool Resource::createContexts() { } else if (Common::File::exists("musicd.rsc") || Common::File::exists("musicd.cmp")) { _contextsCount++; digitalMusic = true; - if (Common::File::exists("musicd.rsc")) + if (Common::File::exists("musicd.cmp")) sprintf(musicFileName, "musicd.cmp"); else sprintf(musicFileName, "musicd.rsc"); @@ -452,22 +452,13 @@ bool Resource::createContexts() { // For ITE, add the digital music file and sfx file information here if (_vm->getGameType() == GType_ITE && digitalMusic && i == _contextsCount - 1) { - if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS) - context->fileName = musicFileName; - else - context->fileName = musicFileName; + context->fileName = musicFileName; context->fileType = GAME_MUSICFILE; } else if (_vm->getGameType() == GType_ITE && !soundFileInArray && i == soundFileIndex) { - if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS) - context->fileName = soundFileName; - else - context->fileName = soundFileName; + context->fileName = soundFileName; context->fileType = GAME_SOUNDFILE; } else if (_vm->getGameType() == GType_ITE && !voicesFileInArray && i == voicesFileIndex) { - if (_vm->getFeatures() & GF_COMPRESSED_SOUNDS) - context->fileName = voicesFileName; - else - context->fileName = voicesFileName; + context->fileName = voicesFileName; // can be GAME_VOICEFILE or GAME_SOUNDFILE | GAME_VOICEFILE or GAME_VOICEFILE | GAME_SWAPENDIAN context->fileType = voiceFileType; } else { |