libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PARALLACTION: Avoid hiding overloaded virtual methods.

Browse Source 
svn-id: r55820
This commit is contained in:
Nicola Mettifogo 2011-02-08 01:44:03 +00:00
parent 452048b271
commit 1a525d1bb7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/parallaction/disk.h
View File

@ -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);

14
engines/parallaction/disk_ns.cpp
View File

@ -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;