[Scummvm-cvs-logs] scummvm master -> 0002eb0eaac6927dbde00b613af85a90803214c0

[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:
0002eb0eaa VOYEUR: Remove some useless variables


Commit: 0002eb0eaac6927dbde00b613af85a90803214c0
    https://github.com/scummvm/scummvm/commit/0002eb0eaac6927dbde00b613af85a90803214c0
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-18T10:53:31-08:00

Commit Message:
VOYEUR: Remove some useless variables

Changed paths:
    engines/voyeur/data.cpp
    engines/voyeur/data.h
    engines/voyeur/voyeur.cpp



diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 527e021..736267c 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -41,7 +41,6 @@ void VoyeurEvent::synchronize(Common::Serializer &s) {
 SVoy::SVoy() {
 	// Initialize all the data fields
 	_abortInterface = false;
-	_fadeICF0 = false;
 	_isAM = false;
 	Common::fill(&_phoneCallsReceived[0], &_phoneCallsReceived[5], false);
 	Common::fill(&_roomHotspotsEnabled[0], &_roomHotspotsEnabled[20], false);
@@ -52,7 +51,6 @@ SVoy::SVoy() {
 	_boltGroupId2 = 0;
 	_computerTextId = 0;
 	_computerTimeMin = _computerTimeMax = 0;
-	_curICF0 = 0;
 	_eventCount = 0;
 	_fadingStep1 = 0;
 	_fadingStep2 = 0;
@@ -71,7 +69,6 @@ SVoy::SVoy() {
 	_viewBounds = nullptr;
 	Common::fill(&_evPicPtrs[0], &_evPicPtrs[6], (PictureResource *)nullptr);
 	Common::fill(&_evCmPtrs[0], &_evCmPtrs[6], (CMapResource *)nullptr);
-	_curICF1 = 0;
 	_policeEvent = 0;
 
 	_eventFlags = EVTFLAG_TIME_DISABLED;
diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h
index 7fd526b..7b16f99 100644
--- a/engines/voyeur/data.h
+++ b/engines/voyeur/data.h
@@ -106,7 +106,6 @@ private:
 
 public:
 	bool _abortInterface;
-	bool _fadeICF0; // Useless variable? (always the same value)
 	bool _isAM;
 	bool _phoneCallsReceived[5];
 	bool _roomHotspotsEnabled[20];
@@ -119,7 +118,6 @@ public:
 	int _computerTextId;
 	int _computerTimeMin;
 	int _computerTimeMax;
-	int _curICF0;   // Useless variable
 	int _eventCount;
 	int _eventFlags;
 	int _fadingAmount1;
@@ -155,7 +153,7 @@ public:
 	void setVm(VoyeurEngine *vm);
 
 	/**
-	 * Synchronise the data
+	 * Synchronize the data
 	 */
 	void synchronize(Common::Serializer &s);
 
@@ -222,7 +220,6 @@ public:
 	bool checkForKey();
 
 private:
-	int _curICF1;   // Useless variable
 	int _policeEvent;
 };
 
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 7a9637d..beaec8a 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -119,9 +119,7 @@ void VoyeurEngine::globalInitBolt() {
 	assert(_graphicsManager._fontPtr->_curFont);
 
 	// Setup default flags
-	_voy._fadeICF0 = false;
 	_voy._viewBounds = nullptr;
-	_voy._curICF0 = _graphicsManager._palFlag ? 0xFFFFA5E0 : 0x5F90; 
 
 	_eventsManager.addFadeInt();
 }
@@ -561,8 +559,7 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
 	int endFrame = decoder.getCurFrame() + totalFrames; 
 
 	_eventsManager.getMouseInfo();
-	if (!_voy._fadeICF0)
-		_eventsManager.startCursorBlink();
+	_eventsManager.startCursorBlink();
 
 	while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager._mouseClicked &&
 			(decoder.getCurFrame() < endFrame)) {