diff options
| author | Ori Avtalion | 2011-02-26 21:22:03 +0200 |
|---|---|---|
| committer | Ori Avtalion | 2011-02-26 21:22:03 +0200 |
| commit | da62869baf6900f08452264ddea0a645b37dca17 (patch) | |
| tree | 8fc312d8a0f0394a94fb744644b470cdb9c28ef8 | |
| parent | 765540a5fd58238c51ea50f96e5a5940dbbf88ef (diff) | |
| download | scummvm-rg350-da62869baf6900f08452264ddea0a645b37dca17.tar.gz scummvm-rg350-da62869baf6900f08452264ddea0a645b37dca17.tar.bz2 scummvm-rg350-da62869baf6900f08452264ddea0a645b37dca17.zip | |
SCI: Avoid hiding overloaded virtual methods
| -rw-r--r-- | engines/sci/sound/drivers/adlib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index 057b7c177f..9780f9fa56 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() { |