aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/file
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/base/file')
-rw-r--r--engines/wintermute/base/file/BPkgFile.cpp7
-rw-r--r--engines/wintermute/base/file/BPkgFile.h4
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp2
-rw-r--r--engines/wintermute/base/file/base_disk_file.h2
-rw-r--r--engines/wintermute/base/file/base_file.cpp8
-rw-r--r--engines/wintermute/base/file/base_file.h6
-rw-r--r--engines/wintermute/base/file/base_file_entry.cpp4
-rw-r--r--engines/wintermute/base/file/base_file_entry.h10
-rw-r--r--engines/wintermute/base/file/base_package.cpp14
-rw-r--r--engines/wintermute/base/file/base_package.h6
-rw-r--r--engines/wintermute/base/file/base_resources.cpp2
-rw-r--r--engines/wintermute/base/file/base_resources.h2
-rw-r--r--engines/wintermute/base/file/base_save_thumb_file.cpp14
-rw-r--r--engines/wintermute/base/file/base_save_thumb_file.h6
14 files changed, 45 insertions, 42 deletions
diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp
index 3acde9c1ff..5e1ebc5922 100644
--- a/engines/wintermute/base/file/BPkgFile.cpp
+++ b/engines/wintermute/base/file/BPkgFile.cpp
@@ -39,6 +39,9 @@
namespace WinterMute {
+// This file is only needed until the next merge/rebase, as wrapCompressedStream now can set a known size
+// as such it is not renamed to follow the convention of the rest of the files.
+
// HACK: wrapCompressedStream might set the size to 0, so we need a way to override it.
class CBPkgFile : public Common::SeekableReadStream {
uint32 _size;
@@ -65,8 +68,8 @@ public:
}
};
-Common::SeekableReadStream *openPkgFile(const Common::String &filename, CBFileManager *fileManager) {
- CBFileEntry *fileEntry;
+Common::SeekableReadStream *openPkgFile(const Common::String &filename, BaseFileManager *fileManager) {
+ BaseFileEntry *fileEntry;
Common::SeekableReadStream *file = NULL;
char fileName[MAX_PATH_LENGTH];
strcpy(fileName, filename.c_str());
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h
index 4356ae5519..ca1b1f837d 100644
--- a/engines/wintermute/base/file/BPkgFile.h
+++ b/engines/wintermute/base/file/BPkgFile.h
@@ -41,8 +41,8 @@ class File;
namespace WinterMute {
-class CBFileManager;
-Common::SeekableReadStream *openPkgFile(const Common::String &filename, CBFileManager *fileManager);
+class BaseFileManager;
+Common::SeekableReadStream *openPkgFile(const Common::String &filename, BaseFileManager *fileManager);
} // end of namespace WinterMute
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 99bf9cff3f..6c89fc22f1 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -45,7 +45,7 @@ void correctSlashes(char *fileName) {
}
}
-Common::SeekableReadStream *openDiskFile(const Common::String &filename, CBFileManager *fileManager) {
+Common::SeekableReadStream *openDiskFile(const Common::String &filename, BaseFileManager *fileManager) {
char fullPath[MAX_PATH_LENGTH];
uint32 prefixSize = 0;
Common::SeekableReadStream *file = NULL;
diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h
index 23e1a0a315..e688a12b50 100644
--- a/engines/wintermute/base/file/base_disk_file.h
+++ b/engines/wintermute/base/file/base_disk_file.h
@@ -35,7 +35,7 @@ class SeekableReadStream;
namespace WinterMute {
-Common::SeekableReadStream *openDiskFile(const Common::String &filename, CBFileManager *fileManager);
+Common::SeekableReadStream *openDiskFile(const Common::String &filename, BaseFileManager *fileManager);
} // end of namespace WinterMute
diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp
index 88a64cb147..d4109bb259 100644
--- a/engines/wintermute/base/file/base_file.cpp
+++ b/engines/wintermute/base/file/base_file.cpp
@@ -38,24 +38,24 @@ namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-CBFile::CBFile(CBGame *inGame): CBBase(inGame) {
+BaseFile::BaseFile(BaseGame *inGame): BaseClass(inGame) {
_pos = 0;
_size = 0;
}
//////////////////////////////////////////////////////////////////////////
-CBFile::~CBFile() {
+BaseFile::~BaseFile() {
}
//////////////////////////////////////////////////////////////////////////
-bool CBFile::isEOF() {
+bool BaseFile::isEOF() {
return _pos == _size;
}
-Common::SeekableReadStream *CBFile::getMemStream() {
+Common::SeekableReadStream *BaseFile::getMemStream() {
uint32 oldPos = getPos();
seek(0);
byte *data = new byte[getSize()];
diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h
index b29fc41299..1a144414fc 100644
--- a/engines/wintermute/base/file/base_file.h
+++ b/engines/wintermute/base/file/base_file.h
@@ -40,7 +40,7 @@ class SeekableReadStream;
namespace WinterMute {
-class CBFile : public CBBase {
+class BaseFile : public BaseClass {
protected:
uint32 _pos;
uint32 _size;
@@ -56,8 +56,8 @@ public:
virtual bool close() = 0;
virtual bool open(const Common::String &filename) = 0;
virtual bool isEOF();
- CBFile(CBGame *inGame);
- virtual ~CBFile();
+ BaseFile(BaseGame *inGame);
+ virtual ~BaseFile();
// Temporary solution to allow usage in ScummVM-code:
virtual Common::SeekableReadStream *getMemStream();
};
diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index 3b6f4c7c16..d3e0fee7b0 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -31,7 +31,7 @@
namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-CBFileEntry::CBFileEntry(CBGame *inGame): CBBase(inGame) {
+BaseFileEntry::BaseFileEntry(BaseGame *inGame): BaseClass(inGame) {
_package = NULL;
_length = _compressedLength = _offset = _flags = 0;
_filename = "";
@@ -43,7 +43,7 @@ CBFileEntry::CBFileEntry(CBGame *inGame): CBBase(inGame) {
//////////////////////////////////////////////////////////////////////////
-CBFileEntry::~CBFileEntry() {
+BaseFileEntry::~BaseFileEntry() {
_package = NULL; // ref only
}
diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h
index ed80821004..0e0375e42d 100644
--- a/engines/wintermute/base/file/base_file_entry.h
+++ b/engines/wintermute/base/file/base_file_entry.h
@@ -34,9 +34,9 @@
namespace WinterMute {
-class CBPackage;
+class BasePackage;
-class CBFileEntry : public CBBase {
+class BaseFileEntry : public BaseClass {
public:
uint32 _timeDate2;
uint32 _timeDate1;
@@ -46,9 +46,9 @@ public:
uint32 _compressedLength;
uint32 _length;
uint32 _offset;
- CBPackage *_package;
- CBFileEntry(CBGame *inGame);
- virtual ~CBFileEntry();
+ BasePackage *_package;
+ BaseFileEntry(BaseGame *inGame);
+ virtual ~BaseFileEntry();
};
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index fab6409c00..03a80f3d8d 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -40,7 +40,7 @@ namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-CBPackage::CBPackage(CBGame *inGame): CBBase(inGame) {
+BasePackage::BasePackage(BaseGame *inGame): BaseClass(inGame) {
_file = NULL;
_name = NULL;
_cD = 0;
@@ -50,14 +50,14 @@ CBPackage::CBPackage(CBGame *inGame): CBBase(inGame) {
//////////////////////////////////////////////////////////////////////////
-CBPackage::~CBPackage() {
+BasePackage::~BasePackage() {
if (_name) delete [] _name;
closeFilePointer(_file);
}
//////////////////////////////////////////////////////////////////////////
-bool CBPackage::open() {
+bool BasePackage::open() {
if (_file) return STATUS_OK;
else {
_file = getFilePointer();
@@ -67,7 +67,7 @@ bool CBPackage::open() {
//////////////////////////////////////////////////////////////////////////
-bool CBPackage::close() {
+bool BasePackage::close() {
delete _file;
_file = NULL;
return STATUS_OK;
@@ -75,7 +75,7 @@ bool CBPackage::close() {
//////////////////////////////////////////////////////////////////////////
-bool CBPackage::read(Common::SeekableReadStream *file, uint32 offset, byte *buffer, uint32 size) {
+bool BasePackage::read(Common::SeekableReadStream *file, uint32 offset, byte *buffer, uint32 size) {
bool ret;
if (DID_FAIL(ret = open())) return ret;
else {
@@ -86,7 +86,7 @@ bool CBPackage::read(Common::SeekableReadStream *file, uint32 offset, byte *buff
}
//////////////////////////////////////////////////////////////////////////
-Common::SeekableReadStream *CBPackage::getFilePointer() {
+Common::SeekableReadStream *BasePackage::getFilePointer() {
Common::File *file = _gameRef->_fileManager->openPackage(_name);
if (!file) {
_gameRef->_fileManager->requestCD(_cD, _name, "");
@@ -96,7 +96,7 @@ Common::SeekableReadStream *CBPackage::getFilePointer() {
}
//////////////////////////////////////////////////////////////////////////
-void CBPackage::closeFilePointer(Common::SeekableReadStream *&file) {
+void BasePackage::closeFilePointer(Common::SeekableReadStream *&file) {
delete file;
file = NULL;
}
diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h
index 52fc4f9677..bf45087f91 100644
--- a/engines/wintermute/base/file/base_package.h
+++ b/engines/wintermute/base/file/base_package.h
@@ -38,7 +38,7 @@ class SeekableReadStream;
namespace WinterMute {
-class CBPackage : public CBBase {
+class BasePackage : public BaseClass {
public:
Common::SeekableReadStream *getFilePointer();
void closeFilePointer(Common::SeekableReadStream *&file);
@@ -51,8 +51,8 @@ public:
char *_name;
int _cD;
Common::SeekableReadStream *_file;
- CBPackage(CBGame *inGame);
- virtual ~CBPackage();
+ BasePackage(BaseGame *inGame);
+ virtual ~BasePackage();
};
diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp
index 09cbae88fe..9b1c9fee04 100644
--- a/engines/wintermute/base/file/base_resources.cpp
+++ b/engines/wintermute/base/file/base_resources.cpp
@@ -2806,7 +2806,7 @@ unsigned char systemfont[] = {
0x01, 0x01, 0x01, 0x01, 0x01, 0x01
} ;
-Common::SeekableReadStream *CBResources::getFile(const Common::String &fileName) {
+Common::SeekableReadStream *BaseResources::getFile(const Common::String &fileName) {
if (scumm_stricmp(fileName.c_str(), "invalid.bmp") == 0) {
return new Common::MemoryReadStream(invalid, sizeof(invalid), DisposeAfterUse::NO);
} else if (scumm_stricmp(fileName.c_str(), "invalid_debug.bmp") == 0) {
diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h
index 6ec0541b5c..6316cecd15 100644
--- a/engines/wintermute/base/file/base_resources.h
+++ b/engines/wintermute/base/file/base_resources.h
@@ -34,7 +34,7 @@
namespace WinterMute {
-class CBResources {
+class BaseResources {
public:
static Common::SeekableReadStream *getFile(const Common::String &fileName);
};
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index 68200d3fc6..a2295b70a5 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -39,19 +39,19 @@ namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
-CBSaveThumbFile::CBSaveThumbFile(CBGame *inGame): CBFile(inGame) {
+BaseSaveThumbFile::BaseSaveThumbFile(BaseGame *inGame): BaseFile(inGame) {
_data = NULL;
}
//////////////////////////////////////////////////////////////////////////
-CBSaveThumbFile::~CBSaveThumbFile() {
+BaseSaveThumbFile::~BaseSaveThumbFile() {
close();
}
//////////////////////////////////////////////////////////////////////////
-bool CBSaveThumbFile::open(const Common::String &filename) {
+bool BaseSaveThumbFile::open(const Common::String &filename) {
close();
if (scumm_strnicmp(filename.c_str(), "savegame:", 9) != 0) return STATUS_FAILED;
@@ -71,7 +71,7 @@ bool CBSaveThumbFile::open(const Common::String &filename) {
char slotFilename[MAX_PATH_LENGTH + 1];
_gameRef->getSaveSlotFilename(slot, slotFilename);
- CBPersistMgr *pm = new CBPersistMgr(_gameRef);
+ BasePersistenceManager *pm = new BasePersistenceManager(_gameRef);
if (!pm) return STATUS_FAILED;
_gameRef->_debugAbsolutePathWarning = false;
@@ -97,7 +97,7 @@ bool CBSaveThumbFile::open(const Common::String &filename) {
//////////////////////////////////////////////////////////////////////////
-bool CBSaveThumbFile::close() {
+bool BaseSaveThumbFile::close() {
delete[] _data;
_data = NULL;
@@ -109,7 +109,7 @@ bool CBSaveThumbFile::close() {
//////////////////////////////////////////////////////////////////////////
-bool CBSaveThumbFile::read(void *buffer, uint32 size) {
+bool BaseSaveThumbFile::read(void *buffer, uint32 size) {
if (!_data || _pos + size > _size) return STATUS_FAILED;
memcpy(buffer, (byte *)_data + _pos, size);
@@ -120,7 +120,7 @@ bool CBSaveThumbFile::read(void *buffer, uint32 size) {
//////////////////////////////////////////////////////////////////////////
-bool CBSaveThumbFile::seek(uint32 pos, int whence) {
+bool BaseSaveThumbFile::seek(uint32 pos, int whence) {
if (!_data) return STATUS_FAILED;
uint32 newPos = 0;
diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h
index 42566581e2..6065f10f81 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.h
+++ b/engines/wintermute/base/file/base_save_thumb_file.h
@@ -35,10 +35,10 @@
namespace WinterMute {
//TODO: Get rid of this
-class CBSaveThumbFile : public CBFile {
+class BaseSaveThumbFile : public BaseFile {
public:
- CBSaveThumbFile(CBGame *Game);
- virtual ~CBSaveThumbFile();
+ BaseSaveThumbFile(BaseGame *Game);
+ virtual ~BaseSaveThumbFile();
virtual bool seek(uint32 pos, int whence = SEEK_SET);
virtual bool read(void *buffer, uint32 size);
virtual bool close();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 10:03:46 +0000