From afa735cec4491c5986c459e889e17fcea94853a5 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 28 Nov 2013 14:19:33 -0500
Subject: FULLPIPE: Fix crash at scene03 load

---
 engines/fullpipe/gfx.cpp   | 14 +++++++++++++-
 engines/fullpipe/utils.cpp | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'engines/fullpipe')

diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 2e89bd6003..fba7e402d2 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -464,6 +464,8 @@ Picture::~Picture() {
 }
 
 void Picture::freePicture() {
+	debug(5, "Picture::freePicture(): file: %s", _memfilename);
+
 	if (_bitmap) {
 		if (testFlags() && !_field_54) {
 			freeData();
@@ -519,7 +521,7 @@ bool Picture::load(MfcArchive &file) {
 
 	getData();
 
-	debug(5, "Picture::load: <%s>", _memfilename);
+	debug(5, "Picture::load: loaded <%s>", _memfilename);
 
 	return true;
 }
@@ -539,6 +541,10 @@ void Picture::setAOIDs() {
 }
 
 void Picture::init() {
+	debug(5, "Picture::init(), %s", _memfilename);
+
+	MemoryObject::getData();
+
 	_bitmap = new Bitmap();
 
 	getDibInfo();
@@ -567,6 +573,12 @@ void Picture::getDibInfo() {
 		warning("Uneven data size: 0x%x", _dataSize);
 	}
 
+	if (!_data) {
+		warning("Picture::getDibInfo: data is empty <%s>", _memfilename);
+
+		MemoryObject::load();
+	}
+
 	Common::MemoryReadStream *s = new Common::MemoryReadStream(_data + off - 32, 32);
 
 	_bitmap->load(s);
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 3304a93667..3c2aaebd83 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -149,6 +149,11 @@ bool MemoryObject::load(MfcArchive &file) {
 void MemoryObject::loadFile(char *filename) {
 	debug(5, "MemoryObject::loadFile(<%s>)", filename);
 	if (!_data) {
+		NGIArchive *arr = g_fullpipe->_currArchive;
+
+		if (g_fullpipe->_currArchive != _libHandle && _libHandle)
+			g_fullpipe->_currArchive = _libHandle;
+
 		Common::SeekableReadStream *s = g_fullpipe->_currArchive->createReadStreamForMember(filename);
 
 		if (s) {
@@ -161,7 +166,11 @@ void MemoryObject::loadFile(char *filename) {
 			s->read(_data, _dataSize);
 
 			delete s;
+		} else {
+			warning("MemoryObject::loadFile(): reading failure");
 		}
+
+		g_fullpipe->_currArchive = arr;
 	}
 }
 
@@ -181,6 +190,8 @@ byte *MemoryObject::loadData() {
 }
 
 void MemoryObject::freeData() {
+	debug(8, "MemoryObject::freeData(): file: %s", _memfilename);
+
 	if (_data)
 		free(_data);
 
-- 
cgit v1.2.3