[Scummvm-cvs-logs] SF.net SVN: scummvm:[55820] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Tue Feb 8 02:44:06 CET 2011
Revision: 55820
http://scummvm.svn.sourceforge.net/scummvm/?rev=55820&view=rev
Author: peres001
Date: 2011-02-08 01:44:03 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
PARALLACTION: Avoid hiding overloaded virtual methods.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk.h
scummvm/trunk/engines/parallaction/disk_ns.cpp
Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h 2011-02-07 23:18:47 UTC (rev 55819)
+++ scummvm/trunk/engines/parallaction/disk.h 2011-02-08 01:44:03 UTC (rev 55820)
@@ -185,8 +185,8 @@
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);
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2011-02-07 23:18:47 UTC (rev 55819)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2011-02-08 01:44:03 UTC (rev 55820)
@@ -935,8 +935,8 @@
}
}
-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 @@
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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list