[Scummvm-cvs-logs] scummvm master -> da62869baf6900f08452264ddea0a645b37dca17
salty-horse
ori at avtalion.name
Sat Feb 26 20:23:04 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
da62869baf SCI: Avoid hiding overloaded virtual methods
Commit: da62869baf6900f08452264ddea0a645b37dca17
https://github.com/scummvm/scummvm/commit/da62869baf6900f08452264ddea0a645b37dca17
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-02-26T11:22:03-08:00
Commit Message:
SCI: Avoid hiding overloaded virtual methods
Changed paths:
engines/sci/sound/drivers/adlib.cpp
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 057b7c1..9780f9f 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -55,7 +55,7 @@ public:
virtual ~MidiDriver_AdLib() { }
// MidiDriver
- int open(bool isSCI0);
+ int openAdLib(bool isSCI0);
void close();
void send(uint32 b);
MidiChannel *allocateChannel() { return NULL; }
@@ -215,7 +215,7 @@ static const int ym3812_note[13] = {
0x2ae
};
-int MidiDriver_AdLib::open(bool isSCI0) {
+int MidiDriver_AdLib::openAdLib(bool isSCI0) {
int rate = _mixer->getOutputRate();
_stereo = STEREO;
@@ -828,7 +828,7 @@ int MidiPlayer_AdLib::open(ResourceManager *resMan) {
return -1;
}
- return static_cast<MidiDriver_AdLib *>(_driver)->open(_version <= SCI_VERSION_0_LATE);
+ return static_cast<MidiDriver_AdLib *>(_driver)->openAdLib(_version <= SCI_VERSION_0_LATE);
}
void MidiPlayer_AdLib::close() {
More information about the Scummvm-git-logs
mailing list