[Scummvm-cvs-logs] scummvm master -> 31d3171b65d9e56b3aa0add8ca05fdb542c13a26

[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:
31d3171b65 VOYEUR: Remove a useless parameter in doTimeBar()


Commit: 31d3171b65d9e56b3aa0add8ca05fdb542c13a26
    https://github.com/scummvm/scummvm/commit/31d3171b65d9e56b3aa0add8ca05fdb542c13a26
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T22:43:41-08:00

Commit Message:
VOYEUR: Remove a useless parameter in doTimeBar()

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



diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 918f833..3ab3067 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1339,7 +1339,7 @@ int ThreadResource::doInterface() {
 
 	do {
 		_vm->_voyeurArea = AREA_INTERFACE;
-		_vm->doTimeBar(true);
+		_vm->doTimeBar();
 		_vm->_eventsManager.getMouseInfo();
 
 		if (checkMansionScroll())
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index 70202b0..445c122 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -242,7 +242,7 @@ public:
 	/**
 	 * Displays the time/charge remaining on the video camera screen
 	 */
-	void doTimeBar(bool force);
+	void doTimeBar();
 
 	/**
 	 * If necessary, flashes the time remaining bar on the video camera screen
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 2c0df87..07003ac 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -1019,7 +1019,7 @@ void VoyeurEngine::makeViewFinder() {
 	}
 
 	(*_graphicsManager._vPort)->drawIfaceTime();
-	doTimeBar(true);
+	doTimeBar();
 	pal->startFade();
 
 	flipPageAndWaitForFade();
@@ -1271,10 +1271,10 @@ void VoyeurEngine::getComputerBrush() {
 	}
 }
 
-void VoyeurEngine::doTimeBar(bool force) {
+void VoyeurEngine::doTimeBar() {
 	flashTimeBar();
 
-	if ((force || _timeBarVal != _voy._RTVNum) && _voy._RTVLimit > 0) {
+	if (_voy._RTVLimit > 0) {
 		if (_voy._RTVNum > _voy._RTVLimit || _voy._RTVNum < 0)
 			_voy._RTVNum = _voy._RTVLimit - 1;