aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/disk.h
diff options
context:
space:
mode:
authorNicola Mettifogo2011-02-08 01:44:03 +0000
committerNicola Mettifogo2011-02-08 01:44:03 +0000
commit1a525d1bb78a34e124aafae090901005333b716d (patch)
tree6f3fdbcad0703d3cd499765c55f36d696927cd61 /engines/parallaction/disk.h
parent452048b271702508059ae41a4573d5f01680add7 (diff)
downloadscummvm-rg350-1a525d1bb78a34e124aafae090901005333b716d.tar.gz
scummvm-rg350-1a525d1bb78a34e124aafae090901005333b716d.tar.bz2
scummvm-rg350-1a525d1bb78a34e124aafae090901005333b716d.zip
PARALLACTION: Avoid hiding overloaded virtual methods.
svn-id: r55820
Diffstat (limited to 'engines/parallaction/disk.h')
-rw-r--r--engines/parallaction/disk.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 449e8ec774..8ff0efd3c6 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -185,8 +185,8 @@ protected:
void unpackBitmap(byte *dst, byte *src, uint16 numFrames, uint16 bytesPerPlane, uint16 height);
Common::SeekableReadStream *tryOpenFile(const char* name);
Font *createFont(const char *name, Common::SeekableReadStream &stream);
- void loadMask(BackgroundInfo& info, const char *name);
- void loadPath(BackgroundInfo& info, const char *name);
+ void loadMask_internal(BackgroundInfo& info, const char *name);
+ void loadPath_internal(BackgroundInfo& info, const char *name);
void loadBackground(BackgroundInfo& info, const char *name);
void buildMask(byte* buf);