aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2011-02-08 01:44:03 +0000
committerNicola Mettifogo2011-02-08 01:44:03 +0000
commit1a525d1bb78a34e124aafae090901005333b716d (patch)
tree6f3fdbcad0703d3cd499765c55f36d696927cd61
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
-rw-r--r--engines/parallaction/disk.h4
-rw-r--r--engines/parallaction/disk_ns.cpp14
2 files changed, 9 insertions, 9 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);
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index f0afafb7b1..98770b9a6d 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -935,8 +935,8 @@ void AmigaDisk_ns::loadBackground(BackgroundInfo& info, const char *name) {
}
}
-void AmigaDisk_ns::loadMask(BackgroundInfo& info, const char *name) {
- debugC(5, kDebugDisk, "AmigaDisk_ns::loadMask(%s)", name);
+void AmigaDisk_ns::loadMask_internal(BackgroundInfo& info, const char *name) {
+ debugC(5, kDebugDisk, "AmigaDisk_ns::loadMask_internal(%s)", name);
char path[PATH_LEN];
sprintf(path, "%s.mask", name);
@@ -962,7 +962,7 @@ void AmigaDisk_ns::loadMask(BackgroundInfo& info, const char *name) {
info._mask = loader._maskBuffer;
}
-void AmigaDisk_ns::loadPath(BackgroundInfo& info, const char *name) {
+void AmigaDisk_ns::loadPath_internal(BackgroundInfo& info, const char *name) {
char path[PATH_LEN];
sprintf(path, "%s.path", name);
@@ -987,11 +987,11 @@ void AmigaDisk_ns::loadScenery(BackgroundInfo& info, const char* background, con
loadBackground(info, filename);
if (mask == 0) {
- loadMask(info, background);
- loadPath(info, background);
+ loadMask_internal(info, background);
+ loadPath_internal(info, background);
} else {
- loadMask(info, mask);
- loadPath(info, mask);
+ loadMask_internal(info, mask);
+ loadPath_internal(info, mask);
}
return;