[Scummvm-cvs-logs] scummvm master -> d90c7a831457ee01f501d564e628fa88374f0419
salty-horse
ori at avtalion.name
Sun Feb 27 21:33:52 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:
d90c7a8314 TOON: Avoid hiding overloaded virtual methods
Commit: d90c7a831457ee01f501d564e628fa88374f0419
https://github.com/scummvm/scummvm/commit/d90c7a831457ee01f501d564e628fa88374f0419
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-02-27T12:32:50-08:00
Commit Message:
TOON: Avoid hiding overloaded virtual methods
Changed paths:
engines/toon/movie.cpp
engines/toon/movie.h
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index c6b57d9..bf4b663 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 2a91738..bed2cec 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;
More information about the Scummvm-git-logs
mailing list