diff options
Diffstat (limited to 'engines/wintermute/base/file')
| -rw-r--r-- | engines/wintermute/base/file/base_package.cpp | 7 | ||||
| -rw-r--r-- | engines/wintermute/base/file/base_package.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index a0f56ddf83..427f2f46f8 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -86,12 +86,13 @@ bool BasePackage::read(Common::SeekableReadStream *file, uint32 offset, byte *bu //////////////////////////////////////////////////////////////////////////
Common::SeekableReadStream *BasePackage::getFilePointer() {
- Common::File *file = _fileManager->openPackage(_name);
+ Common::SeekableReadStream *stream = _fsnode.createReadStream();
+/* Common::File *file = _fileManager->openPackage(_name);
if (!file) {
_fileManager->requestCD(_cd, _name, "");
file = _fileManager->openPackage(_name);
- }
- return file;
+ }*/
+ return stream;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h index af180ac7bf..673655a710 100644 --- a/engines/wintermute/base/file/base_package.h +++ b/engines/wintermute/base/file/base_package.h @@ -30,6 +30,7 @@ #define WINTERMUTE_BPACKAGE_H
#include "common/stream.h"
+#include "common/fs.h"
namespace Common {
class SeekableReadStream;
@@ -43,6 +44,7 @@ public: Common::SeekableReadStream *getFilePointer();
void closeFilePointer(Common::SeekableReadStream *&file);
+ Common::FSNode _fsnode;
bool _boundToExe;
byte _priority;
bool read(Common::SeekableReadStream *file, uint32 offset, byte *buffer, uint32 size);
|