VOYEUR: Another try to get rid of the hidden overloaded functions

4 files changed, 9 insertions, 9 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)
diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h
index 12768b1566..9480c66222 100644
--- a/engines/voyeur/animation.h
+++ b/engines/voyeur/animation.h
@@ -174,7 +174,7 @@ public:
 	virtual void close();
 
 	bool loadStream(Common::SeekableReadStream *stream);
-	virtual bool loadFile(const Common::String &file, bool palFlag);
+	bool loadRL2File(const Common::String &file, bool palFlag);
 	bool loadVideo(int videoId);
 	int getPaletteCount() const { return _header._colorCount; }
 
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 29f0a2d2e8..a93a443697 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -457,7 +457,7 @@ void VoyeurEngine::doOpening() {
 	flipPageAndWait();
 	
 	RL2Decoder decoder;
-	decoder.loadFile("a2300100.rl2", false);
+	decoder.loadRL2File("a2300100.rl2", false);
 	decoder.start();
 	
 	while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager->_mouseClicked) {
@@ -511,7 +511,7 @@ void VoyeurEngine::doOpening() {
 
 void VoyeurEngine::playRL2Video(const Common::String &filename) {
 	RL2Decoder decoder;
-	decoder.loadFile(filename, false);
+	decoder.loadRL2File(filename, false);
 	decoder.start();
 
 	while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager->_mouseClicked) {
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 398b35b074..b4e6ec7a52 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -237,7 +237,7 @@ void VoyeurEngine::doTailTitle() {
 	
 	if (_bVoy->getBoltGroup(0x600)) {
 		RL2Decoder decoder;
-		decoder.loadFile("a1100200.rl2", false);
+		decoder.loadRL2File("a1100200.rl2", false);
 		decoder.start();
 		decoder.play(this);
 		
@@ -742,7 +742,7 @@ void VoyeurEngine::doGossip() {
 
 	// Load the gossip animation
 	RL2Decoder decoder;
-	decoder.loadFile("a2050100.rl2", false);
+	decoder.loadRL2File("a2050100.rl2", false);
 	decoder.start();
 
 	// Get the resource data for the first gossip video
@@ -768,7 +768,7 @@ void VoyeurEngine::doGossip() {
 
 	// Play interview video
 	RL2Decoder decoder2;
-	decoder2.loadFile("a2110100.rl2", true);
+	decoder2.loadRL2File("a2110100.rl2", true);
 	decoder2.start();
 
 	_eventsManager->getMouseInfo();