[Scummvm-cvs-logs] scummvm master -> 857a017e8c8ee0e1df24d3c36d41791413fb202a

[Strangerke]

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:
857a017e8c VOYEUR: Remove a default parameter in RL2Decoder::loadfile()


Commit: 857a017e8c8ee0e1df24d3c36d41791413fb202a
    https://github.com/scummvm/scummvm/commit/857a017e8c8ee0e1df24d3c36d41791413fb202a
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-09T20:22:47+01:00

Commit Message:
VOYEUR: Remove a default parameter in RL2Decoder::loadfile()

Changed paths:
    engines/voyeur/animation.cpp
    engines/voyeur/animation.h
    engines/voyeur/voyeur.cpp
    engines/voyeur/voyeur_game.cpp



diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 7d6e854..08f1ee2 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 5d08b5a..12768b1 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 e32ceef..29f0a2d 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 453e72b..398b35b 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);