[Scummvm-cvs-logs] scummvm master -> 1aa9749beb8abdb972c214dabd1dcefaca236ef3

[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:
1aa9749beb VOYEUR: Fix some shadowed variables in VoyeurEngine


Commit: 1aa9749beb8abdb972c214dabd1dcefaca236ef3
    https://github.com/scummvm/scummvm/commit/1aa9749beb8abdb972c214dabd1dcefaca236ef3
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-20T23:17:56-08:00

Commit Message:
VOYEUR: Fix some shadowed variables in VoyeurEngine

Changed paths:
    engines/voyeur/voyeur_game.cpp



diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 123f0f6..037ef68 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -425,7 +425,6 @@ void VoyeurEngine::reviewTape() {
 	Common::Rect tempRect(58, 30, 58 + 223, 30 + 124);
 	Common::Point pt;
 	int foundIndex;
-	int eventNum;
 
 	_bVoy->getBoltGroup(0x900);
 	PictureResource *cursor = _bVoy->boltEntry(0x903)._picResource;
@@ -550,7 +549,7 @@ void VoyeurEngine::reviewTape() {
 					_graphicsManager._backgroundPage->sFillBox(tempRect.width(), tempRect.height());
 
 					int yp = 45;
-					eventNum = eventStart;
+					int eventNum = eventStart;
 					for (int idx = 0; idx < 8 && eventNum < _voy._eventCount; ++idx, ++eventNum) {
 						_graphicsManager._fontPtr->_picFlags = 0;
 						_graphicsManager._fontPtr->_picSelect = 0xff;
@@ -1395,7 +1394,7 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
 		if (count == 0 || evidIdx >= eventId)
 			continue;
 		
-		PictureResource *pic = _voy._evPicPtrs[arrIndex];
+		pic = _voy._evPicPtrs[arrIndex];
 		_graphicsManager.sDrawPic(pic, *_graphicsManager._vPort,
 			Common::Point((384 - pic->_bounds.width()) / 2,
 			(240 - pic->_bounds.height()) / 2));