aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2013-06-26 19:46:11 -0400
committerEugene Sandulenko2013-09-06 14:48:16 +0300
commit305692fefe567228441e6edea5225d0b4853a9f8 (patch)
tree73b206bbf9fa5d8cdd4310e4755c1a87f6ab1125 /engines
parent88b3e2744038f23d3f7d3944f4a1ead6fba69763 (diff)
downloadscummvm-rg350-305692fefe567228441e6edea5225d0b4853a9f8.tar.gz
scummvm-rg350-305692fefe567228441e6edea5225d0b4853a9f8.tar.bz2
scummvm-rg350-305692fefe567228441e6edea5225d0b4853a9f8.zip
FULLPIPE: Fix MemoryObject loading
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/utils.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index ff3cd71d42..14388f7db3 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -129,14 +129,12 @@ bool MemoryObject::load(MfcArchive &file) {
void MemoryObject::loadFile(char *filename) {
if (!_data) {
- if (g_fullpipe->_currArchive != _libHandle) {
- assert(0);
- }
-
- Common::SeekableReadStream *s = _libHandle->createReadStreamForMember(filename);
+ Common::SeekableReadStream *s = g_fullpipe->_currArchive->createReadStreamForMember(filename);
if (s) {
assert(s->size() > 0);
+
+ debug(0, "Loading %s", filename);
_data = calloc(s->size(), 1);
s->read(_data, s->size());