diff options
| author | Strangerke | 2014-03-09 21:34:32 +0100 |
|---|---|---|
| committer | Strangerke | 2014-03-09 21:34:32 +0100 |
| commit | 118e7395c3cdcc8eb086cc83d094ee8199d44224 (patch) | |
| tree | 8f4afb1014d923cfacc2064cc24e21e0c59930f0 /engines/voyeur/animation.cpp | |
| parent | 857a017e8c8ee0e1df24d3c36d41791413fb202a (diff) | |
| download | scummvm-rg350-118e7395c3cdcc8eb086cc83d094ee8199d44224.tar.gz scummvm-rg350-118e7395c3cdcc8eb086cc83d094ee8199d44224.tar.bz2 scummvm-rg350-118e7395c3cdcc8eb086cc83d094ee8199d44224.zip | |
VOYEUR: Another try to get rid of the hidden overloaded functions
Diffstat (limited to 'engines/voyeur/animation.cpp')
| -rw-r--r-- | engines/voyeur/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp index 08f1ee2dd0..f6c1b20cef 100644 --- a/engines/voyeur/animation.cpp +++ b/engines/voyeur/animation.cpp @@ -50,10 +50,10 @@ RL2Decoder::~RL2Decoder() { bool RL2Decoder::loadVideo(int videoId) { Common::String filename = Common::String::format("%s.rl2", ::Voyeur::SZ_FILENAMES[videoId * 2]); - return loadFile(filename, false); + return loadRL2File(filename, false); } -bool RL2Decoder::loadFile(const Common::String &file, bool palFlag) { +bool RL2Decoder::loadRL2File(const Common::String &file, bool palFlag) { bool result = VideoDecoder::loadFile(file); _paletteStart = palFlag ? 0 : 128; return result; @@ -115,7 +115,7 @@ void RL2Decoder::copyDirtyRectsToBuffer(uint8 *dst, uint pitch) { void RL2Decoder::readNextPacket() { int frameNumber = getCurFrame(); - RL2AudioTrack *audioTrack = getAudioTrack(); + RL2AudioTrack *audioTrack = RL2Decoder::getAudioTrack(); // Handle queueing sound data if (_soundFrameNumber == -1) |