FULLPIPE: Bitmap loading

1 files changed, 15 insertions, 3 deletions

diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 88a21a08fe..be1bcd38a6 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -134,15 +134,27 @@ void MemoryObject::loadFile(char *filename) {
 		if (s) {
 			assert(s->size() > 0);
 
-			debug(0, "Loading %s", filename);
-			_data = calloc(s->size(), 1);
-			s->read(_data, s->size());
+			_dataSize = s->size();
+
+			debug(0, "Loading %s (%d bytes)", filename, _dataSize);
+			_data = (byte *)calloc(_dataSize, 1);
+			s->read(_data, _dataSize);
 
 			delete s;
 		}
 	}
 }
 
+void *MemoryObject::getData() {
+	load();
+
+	if (_field_14 || _flags & 1) {
+		return _data;
+	} else {
+		error("Unhandled packed data");
+	}
+}
+
 MemoryObject2::MemoryObject2() {
 	_data2 = 0;
 }