diff options
| author | Strangerke | 2014-03-09 20:22:47 +0100 | 
|---|---|---|
| committer | Strangerke | 2014-03-09 20:22:47 +0100 | 
| commit | 857a017e8c8ee0e1df24d3c36d41791413fb202a (patch) | |
| tree | ff7b0df80d156ae01ca684a74074237feef8be58 | |
| parent | 2dac5b76b0646a9e1e09790614fd39c5c5c8ed07 (diff) | |
| download | scummvm-rg350-857a017e8c8ee0e1df24d3c36d41791413fb202a.tar.gz scummvm-rg350-857a017e8c8ee0e1df24d3c36d41791413fb202a.tar.bz2 scummvm-rg350-857a017e8c8ee0e1df24d3c36d41791413fb202a.zip | |
VOYEUR: Remove a default parameter in RL2Decoder::loadfile()
| -rw-r--r-- | engines/voyeur/animation.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/animation.h | 2 | ||||
| -rw-r--r-- | engines/voyeur/voyeur.cpp | 4 | ||||
| -rw-r--r-- | engines/voyeur/voyeur_game.cpp | 2 | 
4 files changed, 5 insertions, 5 deletions
| diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp index 7d6e854f87..08f1ee2dd0 100644 --- a/engines/voyeur/animation.cpp +++ b/engines/voyeur/animation.cpp @@ -50,7 +50,7 @@ RL2Decoder::~RL2Decoder() {  bool RL2Decoder::loadVideo(int videoId) {  	Common::String filename = Common::String::format("%s.rl2",   		::Voyeur::SZ_FILENAMES[videoId * 2]); -	return loadFile(filename); +	return loadFile(filename, false);  }  bool RL2Decoder::loadFile(const Common::String &file, bool palFlag) { diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h index 5d08b5a8cf..12768b1566 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 = false); +	virtual bool loadFile(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 e32ceefb00..29f0a2d2e8 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"); +	decoder.loadFile("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); +	decoder.loadFile(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 453e72b315..398b35b074 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"); +		decoder.loadFile("a1100200.rl2", false);  		decoder.start();  		decoder.play(this); | 
