diff options
author | Einar Johan Trøan Sømåen | 2012-06-22 14:10:08 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-06-22 14:10:08 +0200 |
commit | 4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e (patch) | |
tree | 80108256f0cd627c6d17913fbce7aa8420fab987 /engines/wintermute/Base/file/BPkgFile.cpp | |
parent | b06f4ac72c2ea3d4b05ece81a60f699b0bf70086 (diff) | |
download | scummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.tar.gz scummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.tar.bz2 scummvm-rg350-4e33b8ea75719cbeaf9b62c527fd49e94abd6e3e.zip |
WINTERMUTE: Run astyle on the source-files.
Diffstat (limited to 'engines/wintermute/Base/file/BPkgFile.cpp')
-rw-r--r-- | engines/wintermute/Base/file/BPkgFile.cpp | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/engines/wintermute/Base/file/BPkgFile.cpp b/engines/wintermute/Base/file/BPkgFile.cpp index ed3a24f313..02aec3419f 100644 --- a/engines/wintermute/Base/file/BPkgFile.cpp +++ b/engines/wintermute/Base/file/BPkgFile.cpp @@ -45,12 +45,24 @@ class CBPkgFile : public Common::SeekableReadStream { Common::SeekableReadStream *_stream;
public:
CBPkgFile(Common::SeekableReadStream *stream, uint32 knownLength) : _size(knownLength), _stream(stream) {}
- virtual ~CBPkgFile() { delete _stream; }
- virtual uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
- virtual bool eos() const { return _stream->eos(); }
- virtual int32 pos() const { return _stream->pos(); }
- virtual int32 size() const { return _size; }
- virtual bool seek(int32 offset, int whence = SEEK_SET) { return _stream->seek(offset, whence); }
+ virtual ~CBPkgFile() {
+ delete _stream;
+ }
+ virtual uint32 read(void *dataPtr, uint32 dataSize) {
+ return _stream->read(dataPtr, dataSize);
+ }
+ virtual bool eos() const {
+ return _stream->eos();
+ }
+ virtual int32 pos() const {
+ return _stream->pos();
+ }
+ virtual int32 size() const {
+ return _size;
+ }
+ virtual bool seek(int32 offset, int whence = SEEK_SET) {
+ return _stream->seek(offset, whence);
+ }
};
Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileManager *fileManager) {
@@ -66,14 +78,14 @@ Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileMa fileEntry = fileManager->GetPackageEntry(fileName);
if (!fileEntry) return NULL;
-
+
file = fileEntry->_package->GetFilePointer();
if (!file) return NULL;
-
+
// TODO: Cleanup
bool compressed = (fileEntry->_compressedLength != 0);
/* _size = fileEntry->_length; */
-
+
if (compressed) {
// TODO: Really, most of this logic might be doable directly in the fileEntry?
// But for now, this should get us rolling atleast.
@@ -86,7 +98,7 @@ Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileMa }
file->seek(0);
-
+
return file;
}
|