aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/utils.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2013-07-16 23:54:18 +0300
committerEugene Sandulenko2013-09-06 14:48:18 +0300
commit57e03aedd3924cc9f675594b4b504b4f42958b40 (patch)
treefe3d1c73665cc2cf9159c50cf3f34a80f50e15b7 /engines/fullpipe/utils.cpp
parent51a5b5c9c51ac40c3ec27e4b55f8c9118c9a580f (diff)
downloadscummvm-rg350-57e03aedd3924cc9f675594b4b504b4f42958b40.tar.gz
scummvm-rg350-57e03aedd3924cc9f675594b4b504b4f42958b40.tar.bz2
scummvm-rg350-57e03aedd3924cc9f675594b4b504b4f42958b40.zip
FULLPIPE: Initial code for bitmap rendering
Diffstat (limited to 'engines/fullpipe/utils.cpp')
-rw-r--r--engines/fullpipe/utils.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 78440d8d53..6ca6a8e6b9 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -108,7 +108,7 @@ char *MfcArchive::readPascalString(bool twoByte) {
}
MemoryObject::MemoryObject() {
- _filename = 0;
+ _memfilename = 0;
_field_8 = 0;
_field_C = 0;
_field_10 = -1;
@@ -121,7 +121,14 @@ MemoryObject::MemoryObject() {
bool MemoryObject::load(MfcArchive &file) {
debug(5, "MemoryObject::load()");
- _filename = file.readPascalString();
+ _memfilename = file.readPascalString();
+
+ if (char *p = strchr(_memfilename, '\\')) {
+ for (char *d = _memfilename; *p;) {
+ p++;
+ *d++ = *p;
+ }
+ }
if (g_fullpipe->_currArchive) {
_field_14 = 0;
@@ -170,8 +177,10 @@ bool MemoryObject2::load(MfcArchive &file) {
_flags |= 1;
- if (_filename) {
- MemoryObject::loadFile(_filename);
+ debug(5, "MemoryObject2::load: <%s>", _memfilename);
+
+ if (_memfilename && *_memfilename) {
+ MemoryObject::loadFile(_memfilename);
}
return true;