[Scummvm-cvs-logs] SF.net SVN: scummvm:[48000] scummvm/trunk
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Mon Feb 8 19:17:32 CET 2010
Revision: 48000
http://scummvm.svn.sourceforge.net/scummvm/?rev=48000&view=rev
Author: peres001
Date: 2010-02-08 18:17:32 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Renamed ArjFile to ArchiveMan, and _arj to _archives.
Modified Paths:
--------------
scummvm/trunk/common/unarj.cpp
scummvm/trunk/engines/drascula/converse.cpp
scummvm/trunk/engines/drascula/detection.cpp
scummvm/trunk/engines/drascula/drascula.h
scummvm/trunk/engines/drascula/graphics.cpp
scummvm/trunk/engines/drascula/resource.cpp
scummvm/trunk/engines/drascula/rooms.cpp
scummvm/trunk/engines/drascula/sound.cpp
Modified: scummvm/trunk/common/unarj.cpp
===================================================================
--- scummvm/trunk/common/unarj.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/common/unarj.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -320,12 +320,6 @@
-
-
-
-
-
-
//
// Source for init_getbits: arj_file.c (decode_start_stub)
//
Modified: scummvm/trunk/engines/drascula/converse.cpp
===================================================================
--- scummvm/trunk/engines/drascula/converse.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/converse.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -133,7 +133,7 @@
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);
Modified: scummvm/trunk/engines/drascula/detection.cpp
===================================================================
--- scummvm/trunk/engines/drascula/detection.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/detection.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -50,10 +50,10 @@
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);
}
}
Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/drascula.h 2010-02-08 18:17:32 UTC (rev 48000)
@@ -252,10 +252,10 @@
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 @@
byte cPal[768];
- ArjFile _arj;
+ ArchiveMan _archives;
int actorFrames[8];
Modified: scummvm/trunk/engines/drascula/graphics.cpp
===================================================================
--- scummvm/trunk/engines/drascula/graphics.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/graphics.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -93,7 +93,7 @@
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 @@
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 @@
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 @@
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);
Modified: scummvm/trunk/engines/drascula/resource.cpp
===================================================================
--- scummvm/trunk/engines/drascula/resource.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/resource.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -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);
}
Modified: scummvm/trunk/engines/drascula/rooms.cpp
===================================================================
--- scummvm/trunk/engines/drascula/rooms.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/rooms.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -1649,7 +1649,7 @@
strcpy(currentData, fileName);
- Common::SeekableReadStream *stream = _arj.open(fileName);
+ Common::SeekableReadStream *stream = _archives.open(fileName);
if (!stream) {
error("missing data file %s", fileName);
}
Modified: scummvm/trunk/engines/drascula/sound.cpp
===================================================================
--- scummvm/trunk/engines/drascula/sound.cpp 2010-02-08 17:48:35 UTC (rev 47999)
+++ scummvm/trunk/engines/drascula/sound.cpp 2010-02-08 18:17:32 UTC (rev 48000)
@@ -163,7 +163,7 @@
}
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list