aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2004-07-26 23:15:01 +0000
committerMax Horn2004-07-26 23:15:01 +0000
commit908723cc84b78fac6320e1613069e2a9139f2722 (patch)
treea26eea73870f40e093f88718fb9730d9c682bef9 /scumm/scumm.h
parent1db27f0203198137118241c944ba408ca98d6bc6 (diff)
downloadscummvm-rg350-908723cc84b78fac6320e1613069e2a9139f2722.tar.gz
scummvm-rg350-908723cc84b78fac6320e1613069e2a9139f2722.tar.bz2
scummvm-rg350-908723cc84b78fac6320e1613069e2a9139f2722.zip
Load SMUSH files and NUT fonts from mac container files, too (done that by adding a new high level method openFile to class ScummEngine)
svn-id: r14346
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 6736e974ff..8b0a022185 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -66,7 +66,6 @@ private:
byte _encbyte;
uint32 _subFileStart;
uint32 _subFileLen;
- Common::String _subFileName;
public:
ScummFile();
void setEnc(byte value);
@@ -629,6 +628,8 @@ protected:
public:
/** The name of the (macintosh/rescumm style) container file, if any. */
Common::String _containerFile;
+
+ bool openFile(ScummFile &file, const char *filename);
protected:
int _resourceHeaderSize;