aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorOri Avtalion2011-02-27 22:32:50 +0200
committerOri Avtalion2011-02-27 22:32:50 +0200
commitd90c7a831457ee01f501d564e628fa88374f0419 (patch)
tree044ee2074e3206dff40db10141621e27da659f8d /engines
parentee3e08bbc2b4b11ce2b96abdabd72a33425b616d (diff)
downloadscummvm-rg350-d90c7a831457ee01f501d564e628fa88374f0419.tar.gz
scummvm-rg350-d90c7a831457ee01f501d564e628fa88374f0419.tar.bz2
scummvm-rg350-d90c7a831457ee01f501d564e628fa88374f0419.zip
TOON: Avoid hiding overloaded virtual methods
Diffstat (limited to 'engines')
-rw-r--r--engines/toon/movie.cpp6
-rw-r--r--engines/toon/movie.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index c6b57d96e2..bf4b6639fa 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -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)
diff --git a/engines/toon/movie.h b/engines/toon/movie.h
index 2a9173850f..bed2ceceae 100644
--- a/engines/toon/movie.h
+++ b/engines/toon/movie.h
@@ -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;