libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOON: Avoid hiding overloaded virtual methods

Browse Source
This commit is contained in:
Ori Avtalion 2011-02-27 22:32:50 +02:00
parent ee3e08bbc2
commit d90c7a8314
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/toon/movie.cpp
View File

@ -38,8 +38,8 @@ void ToonstruckSmackerDecoder::handleAudioTrack(byte track, uint32 chunkSize, ui
Video::SmackerDecoder::handleAudioTrack(track, chunkSize, unpackedSize);
}
bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename, int forcedflags) {
debugC(1, kDebugMovie, "loadFile(%s, %d)", filename.c_str(), forcedflags);
bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename) {
debugC(1, kDebugMovie, "loadFile(%s)", filename.c_str());
_lowRes = false;
@ -88,7 +88,7 @@ void Movie::play(Common::String video, int32 flags) {
_playing = true;
if (flags & 1)
_vm->getAudioManager()->setMusicVolume(0);
_decoder->loadFile(video.c_str(), flags);
_decoder->loadFile(video.c_str());
playVideo(isFirstIntroVideo);
_vm->flushPalette(false);
if (flags & 1)

2
engines/toon/movie.h
View File

@ -36,7 +36,7 @@ public:
ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType);
virtual ~ToonstruckSmackerDecoder() {}
void handleAudioTrack(byte track, uint32 chunkSize, uint32 unpackedSize);
bool loadFile(const Common::String &filename, int forcedflags);
bool loadFile(const Common::String &filename);
bool isLowRes() { return _lowRes; }
protected:
bool _lowRes;