[Scummvm-cvs-logs] scummvm master -> 52ee33dfa675f0520eb2345c46e2bb0ecaa2aa2f

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
73c366ac5b GNAp: Remove an unused variable
52ee33dfa6 GNAP: Make 2 variables local to setDeviceHotspot


Commit: 73c366ac5b0007177bd094a06b6f94cb78e9084a
    https://github.com/scummvm/scummvm/commit/73c366ac5b0007177bd094a06b6f94cb78e9084a
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-30T07:14:16+02:00

Commit Message:
GNAp: Remove an unused variable

Changed paths:
    engines/gnap/detection.cpp



diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index 25d1544..4445fcde 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -156,7 +156,6 @@ SaveStateDescriptor GnapMetaEngine::querySaveMetaInfos(const char *target, int s
 
 		Common::String saveName;
 		char ch;
-		int i = 0;
 		while ((ch = (char)file->readByte()) != '\0')
 			saveName += ch;
 


Commit: 52ee33dfa675f0520eb2345c46e2bb0ecaa2aa2f
    https://github.com/scummvm/scummvm/commit/52ee33dfa675f0520eb2345c46e2bb0ecaa2aa2f
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-30T07:15:43+02:00

Commit Message:
GNAP: Make 2 variables local to setDeviceHotspot

Changed paths:
    engines/gnap/gnap.cpp
    engines/gnap/gnap.h



diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index d86d1a4..f6c758b 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -160,8 +160,6 @@ GnapEngine::GnapEngine(OSystem *syst, const ADGameDescription *gd) :
 	_fullScreenSpriteId = 0;
 	_deviceX1 = 0;
 	_deviceY1 = 0;
-	_deviceX2 = 0;
-	_deviceY2 = 0;
 	_soundTimerIndexA = 0;
 	_soundTimerIndexB = 0;
 	_soundTimerIndexC = 0;
@@ -654,19 +652,19 @@ void GnapEngine::removeDeviceIconActive() {
 
 void GnapEngine::setDeviceHotspot(int hotspotIndex, int x1, int y1, int x2, int y2) {
 	_deviceX1 = x1;
-	_deviceX2 = x2;
 	_deviceY1 = y1;
-	_deviceY2 = y2;
+	int deviceX2 = x2;
+	int deviceY2 = y2;
 	if (x1 == -1)
 		_deviceX1 = 730;
 	if (x2 == -1)
-		_deviceX2 = 780;
+		deviceX2 = 780;
 	if (y1 == -1)
 		_deviceY1 = 14;
 	if (y2 == -1)
-		_deviceY2 = 79;
+		deviceY2 = 79;
 
-	_hotspots[hotspotIndex]._rect = Common::Rect(_deviceX1, _deviceY1, _deviceX2, _deviceY2);
+	_hotspots[hotspotIndex]._rect = Common::Rect(_deviceX1, _deviceY1, deviceX2, deviceY2);
 	_hotspots[hotspotIndex]._flags = SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
 }
 
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index 84c40e2..2966572 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -296,7 +296,7 @@ public:
 	Graphics::Surface *_fullScreenSprite;
 	int _fullScreenSpriteId;
 
-	int _deviceX1, _deviceY1, _deviceX2, _deviceY2;
+	int _deviceX1, _deviceY1;
 
 	int _soundTimerIndexA;
 	int _soundTimerIndexB;