From afe556742110ac477115083bcd4aeec2f9482b9f Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Sat, 2 Jun 2012 02:58:38 +0200 Subject: WINTERMUTE: Start refactoring the file-files in Base. --- engines/wintermute/Base/BFileManager.cpp | 10 +++--- engines/wintermute/Base/BGame.cpp | 4 +-- engines/wintermute/Base/file/BDiskFile.cpp | 38 ++++++++++---------- engines/wintermute/Base/file/BDiskFile.h | 8 ++--- engines/wintermute/Base/file/BFile.cpp | 8 ++--- engines/wintermute/Base/file/BFile.h | 10 +++--- engines/wintermute/Base/file/BPkgFile.cpp | 20 +++++------ engines/wintermute/Base/file/BPkgFile.h | 8 ++--- engines/wintermute/Base/file/BResourceFile.cpp | 28 +++++++-------- engines/wintermute/Base/file/BSaveThumbFile.cpp | 48 ++++++++++++------------- engines/wintermute/Base/scriptables/SXFile.cpp | 4 +-- 11 files changed, 93 insertions(+), 93 deletions(-) (limited to 'engines') diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp index 06130092ac..8ba77b90b4 100644 --- a/engines/wintermute/Base/BFileManager.cpp +++ b/engines/wintermute/Base/BFileManager.cpp @@ -136,22 +136,22 @@ byte *CBFileManager::ReadWholeFile(const char *Filename, uint32 *Size, bool Must */ - buffer = new byte[File->GetSize() + 1]; + buffer = new byte[File->getSize() + 1]; if (buffer == NULL) { - Game->LOG(0, "Error allocating buffer for file '%s' (%d bytes)", Filename, File->GetSize() + 1); + Game->LOG(0, "Error allocating buffer for file '%s' (%d bytes)", Filename, File->getSize() + 1); CloseFile(File); return NULL; } - if (FAILED(File->Read(buffer, File->GetSize()))) { + if (FAILED(File->Read(buffer, File->getSize()))) { Game->LOG(0, "Error reading file '%s'", Filename); CloseFile(File); delete [] buffer; return NULL; }; - buffer[File->GetSize()] = '\0'; - if (Size != NULL) *Size = File->GetSize(); + buffer[File->getSize()] = '\0'; + if (Size != NULL) *Size = File->getSize(); CloseFile(File); return buffer; diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 287092e02d..9b840cd273 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -2079,8 +2079,8 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS byte Buf[1024]; int BytesRead = 0; - while (BytesRead < File->GetSize()) { - int BufSize = MIN((uint32)1024, File->GetSize() - BytesRead); + while (BytesRead < File->getSize()) { + int BufSize = MIN((uint32)1024, File->getSize() - BytesRead); BytesRead += BufSize; File->Read(Buf, BufSize); diff --git a/engines/wintermute/Base/file/BDiskFile.cpp b/engines/wintermute/Base/file/BDiskFile.cpp index b807925772..8540829f09 100644 --- a/engines/wintermute/Base/file/BDiskFile.cpp +++ b/engines/wintermute/Base/file/BDiskFile.cpp @@ -60,7 +60,7 @@ HRESULT CBDiskFile::Open(const Common::String &Filename) { for (int i = 0; i < Game->_fileManager->_singlePaths.GetSize(); i++) { sprintf(FullPath, "%s%s", Game->_fileManager->_singlePaths[i], Filename.c_str()); - CorrectSlashes(FullPath); + correctSlashes(FullPath); //_file = Common::createFileStream(FullPath); Common::File *tempFile = new Common::File(); if (tempFile->open(FullPath)) { @@ -77,7 +77,7 @@ HRESULT CBDiskFile::Open(const Common::String &Filename) { // if we didn't find it in search paths, try to open directly if (!_file) { strcpy(FullPath, Filename.c_str()); - CorrectSlashes(FullPath); + correctSlashes(FullPath); //error("Tried to open %s, TODO: add SearchMan-support", Filename.c_str()); //_file = Common::createFileStream(FullPath); Common::File *tempFile = new Common::File(); @@ -161,15 +161,15 @@ HRESULT CBDiskFile::Close() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBDiskFile::Read(void *Buffer, uint32 Size) { +HRESULT CBDiskFile::Read(void *buffer, uint32 size) { if (_compressed) { - memcpy(Buffer, _data + _pos, Size); - _pos += Size; + memcpy(buffer, _data + _pos, size); + _pos += size; return S_OK; } else { if (_file) { - size_t count = _file->read(Buffer, Size); + size_t count = _file->read(buffer, size); _pos += count; return S_OK; } else return E_FAIL; @@ -178,39 +178,39 @@ HRESULT CBDiskFile::Read(void *Buffer, uint32 Size) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBDiskFile::Seek(uint32 Pos, TSeek Origin) { +HRESULT CBDiskFile::Seek(uint32 pos, TSeek origin) { // TODO: Should this really need to use uint32? if (_compressed) { - uint32 NewPos = 0; + uint32 newPos = 0; - switch (Origin) { + switch (origin) { case SEEK_TO_BEGIN: - NewPos = Pos; + newPos = pos; break; case SEEK_TO_END: - NewPos = _size + Pos; + newPos = _size + pos; break; case SEEK_TO_CURRENT: - NewPos = _pos + Pos; + newPos = _pos + pos; break; } - if (NewPos < 0 || NewPos > _size) return E_FAIL; - else _pos = NewPos; + if (newPos < 0 || newPos > _size) return E_FAIL; + else _pos = newPos; return S_OK; } else { if (!_file) return E_FAIL; int ret = 1; - switch (Origin) { + switch (origin) { case SEEK_TO_BEGIN: - ret = _file->seek(_prefixSize + Pos, SEEK_SET); + ret = _file->seek(_prefixSize + pos, SEEK_SET); break; case SEEK_TO_END: - ret = _file->seek(Pos, SEEK_END); + ret = _file->seek(pos, SEEK_END); break; case SEEK_TO_CURRENT: - ret = _file->seek(Pos, SEEK_CUR); + ret = _file->seek(pos, SEEK_CUR); break; } if (ret == 0) { @@ -221,7 +221,7 @@ HRESULT CBDiskFile::Seek(uint32 Pos, TSeek Origin) { } ////////////////////////////////////////////////////////////////////////// -void CBDiskFile::CorrectSlashes(char *fileName) { +void CBDiskFile::correctSlashes(char *fileName) { for (size_t i = 0; i < strlen(fileName); i++) { if (fileName[i] == '\\') fileName[i] = '/'; } diff --git a/engines/wintermute/Base/file/BDiskFile.h b/engines/wintermute/Base/file/BDiskFile.h index 89fd81b858..d9e7af548f 100644 --- a/engines/wintermute/Base/file/BDiskFile.h +++ b/engines/wintermute/Base/file/BDiskFile.h @@ -42,12 +42,12 @@ class CBDiskFile : public CBFile { public: CBDiskFile(CBGame *inGame); virtual ~CBDiskFile(); - virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN); - virtual HRESULT Read(void *Buffer, uint32 Size); + virtual HRESULT Seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN); + virtual HRESULT Read(void *buffer, uint32 size); virtual HRESULT Close(); - virtual HRESULT Open(const Common::String &Filename); + virtual HRESULT Open(const Common::String &filename); private: - void CorrectSlashes(char *fileName); + void correctSlashes(char *fileName); Common::SeekableReadStream *_file; byte *_data; bool _compressed; diff --git a/engines/wintermute/Base/file/BFile.cpp b/engines/wintermute/Base/file/BFile.cpp index f3a37614a3..6fa7cb84d6 100644 --- a/engines/wintermute/Base/file/BFile.cpp +++ b/engines/wintermute/Base/file/BFile.cpp @@ -56,12 +56,12 @@ bool CBFile::IsEOF() { } Common::SeekableReadStream *CBFile::getMemStream() { - uint32 oldPos = GetPos(); + uint32 oldPos = getPos(); Seek(0); - byte *data = new byte[GetSize()]; - Read(data, GetSize()); + byte *data = new byte[getSize()]; + Read(data, getSize()); Seek(oldPos); - Common::MemoryReadStream *memStream = new Common::MemoryReadStream(data, GetSize(), DisposeAfterUse::YES); + Common::MemoryReadStream *memStream = new Common::MemoryReadStream(data, getSize(), DisposeAfterUse::YES); return memStream; } diff --git a/engines/wintermute/Base/file/BFile.h b/engines/wintermute/Base/file/BFile.h index bfabb9dfb9..fa6fafcb25 100644 --- a/engines/wintermute/Base/file/BFile.h +++ b/engines/wintermute/Base/file/BFile.h @@ -44,16 +44,16 @@ protected: uint32 _pos; uint32 _size; public: - virtual uint32 GetSize() { + virtual uint32 getSize() { return _size; }; - virtual uint32 GetPos() { + virtual uint32 getPos() { return _pos; }; - virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN) = 0; - virtual HRESULT Read(void *Buffer, uint32 Size) = 0; + virtual HRESULT Seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN) = 0; + virtual HRESULT Read(void *buffer, uint32 size) = 0; virtual HRESULT Close() = 0; - virtual HRESULT Open(const Common::String &Filename) = 0; + virtual HRESULT Open(const Common::String &filename) = 0; virtual bool IsEOF(); CBFile(CBGame *inGame); virtual ~CBFile(); diff --git a/engines/wintermute/Base/file/BPkgFile.cpp b/engines/wintermute/Base/file/BPkgFile.cpp index d1802f36a9..fe04b816d2 100644 --- a/engines/wintermute/Base/file/BPkgFile.cpp +++ b/engines/wintermute/Base/file/BPkgFile.cpp @@ -125,36 +125,36 @@ HRESULT CBPkgFile::Read(void *Buffer, uint32 Size) { ////////////////////////////////////////////////////////////////////////// -HRESULT CBPkgFile::Seek(uint32 Pos, TSeek Origin) { +HRESULT CBPkgFile::Seek(uint32 pos, TSeek origin) { if (!_fileEntry) return E_FAIL; - uint32 NewPos = 0; + uint32 newPos = 0; - switch (Origin) { + switch (origin) { case SEEK_TO_BEGIN: - NewPos = Pos; + newPos = pos; break; case SEEK_TO_END: - NewPos = _size + Pos; + newPos = _size + pos; break; case SEEK_TO_CURRENT: - NewPos = _pos + Pos; + newPos = _pos + pos; break; } - if (NewPos < 0 || NewPos > _size) return E_FAIL; + if (newPos < 0 || newPos > _size) return E_FAIL; - return SeekToPos(NewPos); + return SeekToPos(newPos); } #define STREAM_BUFFER_SIZE 4096 ////////////////////////////////////////////////////////////////////////// -HRESULT CBPkgFile::SeekToPos(uint32 NewPos) { +HRESULT CBPkgFile::SeekToPos(uint32 newPos) { HRESULT ret = S_OK; // seek compressed stream to NewPos - _pos = NewPos; + _pos = newPos; return ret; } diff --git a/engines/wintermute/Base/file/BPkgFile.h b/engines/wintermute/Base/file/BPkgFile.h index e4acdf1eb9..912b351ac8 100644 --- a/engines/wintermute/Base/file/BPkgFile.h +++ b/engines/wintermute/Base/file/BPkgFile.h @@ -47,13 +47,13 @@ class CBPkgFile : public CBFile { public: CBPkgFile(CBGame *inGame); virtual ~CBPkgFile(); - virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN); - virtual HRESULT Read(void *Buffer, uint32 Size); + virtual HRESULT Seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN); + virtual HRESULT Read(void *buffer, uint32 size); virtual HRESULT Close(); - virtual HRESULT Open(const Common::String &Filename); + virtual HRESULT Open(const Common::String &filename); private: bool _inflateInit; - HRESULT SeekToPos(uint32 NewPos); + HRESULT SeekToPos(uint32 newPos); bool _compressed; CBFileEntry *_fileEntry; Common::SeekableReadStream *_file; diff --git a/engines/wintermute/Base/file/BResourceFile.cpp b/engines/wintermute/Base/file/BResourceFile.cpp index 8ec47f72c3..9ac93c4f9b 100644 --- a/engines/wintermute/Base/file/BResourceFile.cpp +++ b/engines/wintermute/Base/file/BResourceFile.cpp @@ -45,10 +45,10 @@ CBResourceFile::~CBResourceFile() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBResourceFile::Open(const Common::String &Filename) { +HRESULT CBResourceFile::Open(const Common::String &filename) { Close(); - if (CBResources::GetFile(Filename.c_str(), _data, _size)) { + if (CBResources::GetFile(filename.c_str(), _data, _size)) { _pos = 0; return S_OK; } @@ -66,36 +66,36 @@ HRESULT CBResourceFile::Close() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBResourceFile::Read(void *Buffer, uint32 Size) { - if (!_data || _pos + Size > _size) return E_FAIL; +HRESULT CBResourceFile::Read(void *buffer, uint32 size) { + if (!_data || _pos + size > _size) return E_FAIL; - memcpy(Buffer, (byte *)_data + _pos, Size); - _pos += Size; + memcpy(buffer, (byte *)_data + _pos, size); + _pos += size; return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBResourceFile::Seek(uint32 Pos, TSeek Origin) { +HRESULT CBResourceFile::Seek(uint32 pos, TSeek origin) { if (!_data) return E_FAIL; - int32 NewPos = 0; + int32 newPos = 0; - switch (Origin) { + switch (origin) { case SEEK_TO_BEGIN: - NewPos = Pos; + newPos = pos; break; case SEEK_TO_END: - NewPos = _size + Pos; + newPos = _size + pos; break; case SEEK_TO_CURRENT: - NewPos = _pos + Pos; + newPos = _pos + pos; break; } - if (NewPos < 0 || NewPos > _size) return E_FAIL; - else _pos = NewPos; + if (newPos < 0 || newPos > _size) return E_FAIL; + else _pos = newPos; return S_OK; } diff --git a/engines/wintermute/Base/file/BSaveThumbFile.cpp b/engines/wintermute/Base/file/BSaveThumbFile.cpp index 357a9606c7..f976b4a00c 100644 --- a/engines/wintermute/Base/file/BSaveThumbFile.cpp +++ b/engines/wintermute/Base/file/BSaveThumbFile.cpp @@ -51,31 +51,31 @@ CBSaveThumbFile::~CBSaveThumbFile() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBSaveThumbFile::Open(const Common::String &Filename) { +HRESULT CBSaveThumbFile::Open(const Common::String &filename) { Close(); - if (scumm_strnicmp(Filename.c_str(), "savegame:", 9) != 0) return E_FAIL; + if (scumm_strnicmp(filename.c_str(), "savegame:", 9) != 0) return E_FAIL; - char *TempFilename = new char[strlen(Filename.c_str()) - 8]; - strcpy(TempFilename, Filename.c_str() + 9); - for (int i = 0; i < strlen(TempFilename); i++) { - if (TempFilename[i] < '0' || TempFilename[i] > '9') { - TempFilename[i] = '\0'; + char *tempFilename = new char[strlen(filename.c_str()) - 8]; + strcpy(tempFilename, filename.c_str() + 9); + for (int i = 0; i < strlen(tempFilename); i++) { + if (tempFilename[i] < '0' || tempFilename[i] > '9') { + tempFilename[i] = '\0'; break; } } // get slot number from name - int Slot = atoi(TempFilename); - delete [] TempFilename; + int slot = atoi(tempFilename); + delete [] tempFilename; - char SlotFilename[MAX_PATH + 1]; - Game->GetSaveSlotFilename(Slot, SlotFilename); + char slotFilename[MAX_PATH + 1]; + Game->GetSaveSlotFilename(slot, slotFilename); CBPersistMgr *pm = new CBPersistMgr(Game); if (!pm) return E_FAIL; Game->_dEBUG_AbsolutePathWarning = false; - if (FAILED(pm->InitLoad(SlotFilename))) { + if (FAILED(pm->InitLoad(slotFilename))) { Game->_dEBUG_AbsolutePathWarning = true; delete pm; return E_FAIL; @@ -109,36 +109,36 @@ HRESULT CBSaveThumbFile::Close() { ////////////////////////////////////////////////////////////////////////// -HRESULT CBSaveThumbFile::Read(void *Buffer, uint32 Size) { - if (!_data || _pos + Size > _size) return E_FAIL; +HRESULT CBSaveThumbFile::Read(void *buffer, uint32 size) { + if (!_data || _pos + size > _size) return E_FAIL; - memcpy(Buffer, (byte *)_data + _pos, Size); - _pos += Size; + memcpy(buffer, (byte *)_data + _pos, size); + _pos += size; return S_OK; } ////////////////////////////////////////////////////////////////////////// -HRESULT CBSaveThumbFile::Seek(uint32 Pos, TSeek Origin) { +HRESULT CBSaveThumbFile::Seek(uint32 pos, TSeek origin) { if (!_data) return E_FAIL; - uint32 NewPos = 0; + uint32 newPos = 0; - switch (Origin) { + switch (origin) { case SEEK_TO_BEGIN: - NewPos = Pos; + newPos = pos; break; case SEEK_TO_END: - NewPos = _size + Pos; + newPos = _size + pos; break; case SEEK_TO_CURRENT: - NewPos = _pos + Pos; + newPos = _pos + pos; break; } - if (NewPos < 0 || NewPos > _size) return E_FAIL; - else _pos = NewPos; + if (newPos < 0 || newPos > _size) return E_FAIL; + else _pos = newPos; return S_OK; } diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp index ebdb436235..e73f244f00 100644 --- a/engines/wintermute/Base/scriptables/SXFile.cpp +++ b/engines/wintermute/Base/scriptables/SXFile.cpp @@ -652,7 +652,7 @@ HRESULT CSXFile::ScSetProperty(const char *Name, CScValue *Value) { ////////////////////////////////////////////////////////////////////////// uint32 CSXFile::GetPos() { - if (_mode == 1 && _readFile) return _readFile->GetPos(); + if (_mode == 1 && _readFile) return _readFile->getPos(); else if ((_mode == 2 || _mode == 3) && _writeFile) return ftell(_writeFile); else return 0; } @@ -666,7 +666,7 @@ bool CSXFile::SetPos(uint32 Pos, TSeek Origin) { ////////////////////////////////////////////////////////////////////////// uint32 CSXFile::GetLength() { - if (_mode == 1 && _readFile) return _readFile->GetSize(); + if (_mode == 1 && _readFile) return _readFile->getSize(); else if ((_mode == 2 || _mode == 3) && _writeFile) { uint32 CurrentPos = ftell(_writeFile); fseek(_writeFile, 0, SEEK_END); -- cgit v1.2.3