aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorEugene Sandulenko2017-01-17 20:28:12 +0100
committerEugene Sandulenko2017-01-17 20:30:32 +0100
commit4ede54e6b0f76201937fc90387f3579fbb546719 (patch)
treee5ba68dfcfac176541a6eba7e81155bdc2ec32a3 /common
parent1fea15ac7bb4533bc2e6a90b5a9661ce56430bb0 (diff)
downloadscummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.tar.gz
scummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.tar.bz2
scummvm-rg350-4ede54e6b0f76201937fc90387f3579fbb546719.zip
GRAPHICS: Rename MacFont to MacFONTFont to avoid clashed
Diffstat (limited to 'common')
-rw-r--r--common/macresman.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/macresman.h b/common/macresman.h
index 05b2a875f4..1be825b7b4 100644
--- a/common/macresman.h
+++ b/common/macresman.h
@@ -176,6 +176,11 @@ public:
*/
MacResTagArray getResTagArray();
+ /**
+ * Load from stream in MacBinary format
+ */
+ bool loadFromMacBinary(SeekableReadStream &stream);
+
private:
SeekableReadStream *_stream;
String _baseFileName;
@@ -183,7 +188,6 @@ private:
bool load(SeekableReadStream &stream);
bool loadFromRawFork(SeekableReadStream &stream);
- bool loadFromMacBinary(SeekableReadStream &stream);
bool loadFromAppleDouble(SeekableReadStream &stream);
static String constructAppleDoubleName(String name);