[Scummvm-cvs-logs] scummvm master -> af67394b44c4acaa56ff9a5d91475e75cefc8fa0

Strangerke Strangerke at scummvm.org
Sun Mar 9 19:30:06 CET 2014


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:
af67394b44 VOYEUR: Fix a couple of hidden overloaded virtual functions


Commit: af67394b44c4acaa56ff9a5d91475e75cefc8fa0
    https://github.com/scummvm/scummvm/commit/af67394b44c4acaa56ff9a5d91475e75cefc8fa0
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-09T19:27:17+01:00

Commit Message:
VOYEUR: Fix a couple of hidden overloaded virtual functions

Changed paths:
    engines/voyeur/animation.h



diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h
index dcdbf36..273fc01 100644
--- a/engines/voyeur/animation.h
+++ b/engines/voyeur/animation.h
@@ -175,7 +175,7 @@ public:
 	virtual void close();
 
 	bool loadStream(Common::SeekableReadStream *stream);
-	bool loadFile(const Common::String &file, bool palFlag = false);
+	virtual bool loadFile(const Common::String &file, bool palFlag = false);
 	bool loadVideo(int videoId);
 	int getPaletteCount() const { return _header._colorCount; }
 
@@ -188,7 +188,7 @@ public:
 	 */
 	void play(VoyeurEngine *vm, int resourceOffset = 0, byte *frames = NULL, byte *imgPos = NULL);
 	RL2VideoTrack *getVideoTrack() { return _videoTrack; }
-	RL2AudioTrack *getAudioTrack() { return _audioTrack; }
+	virtual RL2AudioTrack *getAudioTrack() { return _audioTrack; }
 };
 
 } // End of namespace Voyeur






More information about the Scummvm-git-logs mailing list