aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2004-04-17 16:29:03 +0000
committerMax Horn2004-04-17 16:29:03 +0000
commit9defe4fc1880ab8926c5cdf167f35985c7ee9afc (patch)
tree6413d350e3d082b9324185a0e6798dd15fd8a58f /scumm/sound.cpp
parentae50adfd310cc4304129e5c2b5de7ffc69ba229c (diff)
downloadscummvm-rg350-9defe4fc1880ab8926c5cdf167f35985c7ee9afc.tar.gz
scummvm-rg350-9defe4fc1880ab8926c5cdf167f35985c7ee9afc.tar.bz2
scummvm-rg350-9defe4fc1880ab8926c5cdf167f35985c7ee9afc.zip
Removed XOR encoding stuff from File class; instead the new Scumm::XORFile class provides this functionality now
svn-id: r13597
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 8d40f16c64..a668c8c82a 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -892,7 +892,7 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle,
File *Sound::openSfxFile() {
char buf[256];
- File *file = new File();
+ XORFile *file = new XORFile();
_offsetTable = NULL;
struct SoundFileExtensions {
@@ -935,7 +935,8 @@ File *Sound::openSfxFile() {
if (!file->isOpen()) {
sprintf(buf, "%s.tlk", _vm->getGameName());
- file->open(buf, _vm->getGameDataPath(), File::kFileReadMode, 0x69);
+ file->open(buf);
+ file->setEnc(0x69);
_soundMode = kVOCMode;
} else if (_soundMode != kVOCMode) {
/* Now load the 'offset' index in memory to be able to find the MP3 data