diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/drascula/converse.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/detection.cpp | 4 | ||||
-rw-r--r-- | engines/drascula/drascula.h | 8 | ||||
-rw-r--r-- | engines/drascula/graphics.cpp | 8 | ||||
-rw-r--r-- | engines/drascula/resource.cpp | 10 | ||||
-rw-r--r-- | engines/drascula/rooms.cpp | 2 | ||||
-rw-r--r-- | engines/drascula/sound.cpp | 2 |
7 files changed, 17 insertions, 19 deletions
diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp index 0cd9794cc3..40a1ac80a1 100644 --- a/engines/drascula/converse.cpp +++ b/engines/drascula/converse.cpp @@ -133,7 +133,7 @@ void DrasculaEngine::cleanupString(char *string) { void DrasculaEngine::converse(int index) { char fileName[20]; sprintf(fileName, "op_%d.cal", index); - Common::SeekableReadStream *stream = _arj.open(fileName); + Common::SeekableReadStream *stream = _archives.open(fileName); if (!stream) error("missing data file %s", fileName); diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 31606023f5..a4a6426a5a 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -50,10 +50,10 @@ void DrasculaEngine::loadArchives() { if (getFeatures() & GF_PACKED) { for (ag = _gameDescription->desc.filesDescriptions; ag->fileName; ag++) - _arj.registerArchive(ag->fileName); + _archives.registerArchive(ag->fileName); } - _arj.enableFallback(true); + _archives.enableFallback(true); } } diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h index 86642319de..0b04d0b001 100644 --- a/engines/drascula/drascula.h +++ b/engines/drascula/drascula.h @@ -252,10 +252,10 @@ struct CharInfo { byte charType; // 0 - letters, 1 - signs, 2 - accented }; -class ArjFile : public Common::SearchSet { +class ArchiveMan : public Common::SearchSet { public: - ArjFile(); - ~ArjFile(); + ArchiveMan(); + ~ArchiveMan(); void enableFallback(bool val) { _fallBack = val; } @@ -382,7 +382,7 @@ public: byte cPal[768]; - ArjFile _arj; + ArchiveMan _archives; int actorFrames[8]; diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 6298c89527..40edf42e41 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -93,7 +93,7 @@ void DrasculaEngine::loadPic(const char *NamePcc, byte *targetSurface, int color uint dataSize = 0; byte *pcxData; - Common::SeekableReadStream *stream = _arj.open(NamePcc); + Common::SeekableReadStream *stream = _archives.open(NamePcc); if (!stream) error("missing game data %s %c", NamePcc, 7); @@ -388,7 +388,7 @@ void DrasculaEngine::screenSaver() { ghost = (byte *)malloc(65536); // carga_ghost(); - Common::SeekableReadStream *stream = _arj.open("ghost.drv"); + Common::SeekableReadStream *stream = _archives.open("ghost.drv"); if (!stream) error("Cannot open file ghost.drv"); @@ -477,7 +477,7 @@ void DrasculaEngine::playFLI(const char *filefli, int vel) { globalSpeed = 1000 / vel; FrameSSN = 0; _useMemForArj = false; - Common::SeekableReadStream *stream = _arj.open(filefli); + Common::SeekableReadStream *stream = _archives.open(filefli); // TODO: mSession is treated like a stream from playFrameSSN, so turn it // into a stream, and pass it to playFrameSSN. Get rid of _useMemForArj // as well. @@ -660,7 +660,7 @@ bool DrasculaEngine::animate(const char *animationFile, int FPS) { int NFrames = 1; int cnt = 2; - Common::SeekableReadStream *stream = _arj.open(animationFile); + Common::SeekableReadStream *stream = _archives.open(animationFile); if (!stream) { error("Animation file %s not found", animationFile); diff --git a/engines/drascula/resource.cpp b/engines/drascula/resource.cpp index abe68ef86b..cfa8ab9af3 100644 --- a/engines/drascula/resource.cpp +++ b/engines/drascula/resource.cpp @@ -27,20 +27,18 @@ namespace Drascula { -#pragma mark ArjFile implementation - -ArjFile::ArjFile() { +ArchiveMan::ArchiveMan() { _fallBack = false; } -ArjFile::~ArjFile() { +ArchiveMan::~ArchiveMan() { } -void ArjFile::registerArchive(const Common::String &filename) { +void ArchiveMan::registerArchive(const Common::String &filename) { add(filename, new Common::ArjArchive(filename)); } -Common::SeekableReadStream *ArjFile::open(const Common::String &filename) { +Common::SeekableReadStream *ArchiveMan::open(const Common::String &filename) { if (_fallBack && SearchMan.hasFile(filename)) { return SearchMan.createReadStreamForMember(filename); } diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index bd73386bbd..4d9cb3b4cf 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -1649,7 +1649,7 @@ void DrasculaEngine::enterRoom(int roomIndex) { strcpy(currentData, fileName); - Common::SeekableReadStream *stream = _arj.open(fileName); + Common::SeekableReadStream *stream = _archives.open(fileName); if (!stream) { error("missing data file %s", fileName); } diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp index d8cd838b21..90f3400c1c 100644 --- a/engines/drascula/sound.cpp +++ b/engines/drascula/sound.cpp @@ -163,7 +163,7 @@ void DrasculaEngine::MusicFadeout() { } void DrasculaEngine::playFile(const char *fname) { - Common::SeekableReadStream *stream = _arj.open(fname); + Common::SeekableReadStream *stream = _archives.open(fname); if (stream) { int soundSize = stream->size(); byte *soundData = (byte *)malloc(soundSize); |