[Scummvm-cvs-logs] scummvm master -> e0c032d87abc0f000f9ccb55853a5988ff3e5be5

[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:
7792297691 GNAP: Initialize two more variables
e0c032d87a GNAP: Make two variables local to Scene52::run()


Commit: 7792297691fa17abcbe9a695e092bab01d19a41c
    https://github.com/scummvm/scummvm/commit/7792297691fa17abcbe9a695e092bab01d19a41c
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-30T07:25:59+02:00

Commit Message:
GNAP: Initialize two more variables

Changed paths:
    engines/gnap/scenes/arcade.cpp
    engines/gnap/scenes/group2.cpp



diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index 028a900..5d65bc7 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -1884,6 +1884,9 @@ Scene52::Scene52(GnapEngine *vm) : Scene(vm) {
 	_aliensCount = 0;
 	_nextUfoSequenceId = -1;
 	_ufoSequenceId = -1;
+	_liveAlienRows = 0;
+	_arcadeScreenLeft = 0;
+	_arcadeScreenRight = 0;
 }
 
 int Scene52::init() {
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 522a3f4..1db3144 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -1021,6 +1021,7 @@ Scene22::Scene22(GnapEngine *vm) : Scene(vm) {
 	_caughtBefore = false;
 	_cashierCtr = 3;
 	_nextCashierSequenceId = -1;
+	_currCashierSequenceId = -1;
 }
 
 int Scene22::init() {


Commit: e0c032d87abc0f000f9ccb55853a5988ff3e5be5
    https://github.com/scummvm/scummvm/commit/e0c032d87abc0f000f9ccb55853a5988ff3e5be5
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-30T07:34:28+02:00

Commit Message:
GNAP: Make two variables local to Scene52::run()

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



diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index 5d65bc7..94d3c7d 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -1885,8 +1885,6 @@ Scene52::Scene52(GnapEngine *vm) : Scene(vm) {
 	_nextUfoSequenceId = -1;
 	_ufoSequenceId = -1;
 	_liveAlienRows = 0;
-	_arcadeScreenLeft = 0;
-	_arcadeScreenRight = 0;
 }
 
 int Scene52::init() {
@@ -2642,8 +2640,8 @@ void Scene52::run() {
 	_shipMidY = _vm->_gameSys->getSpriteHeightById(15);
 	_shipPosX = (800 - _shipMidX) / 2;
 	_arcadeScreenBottom = 496;
-	_arcadeScreenRight = 595 - _shipMidX;
-	_arcadeScreenLeft = 210;
+	int arcadeScreenRight = 595 - _shipMidX;
+	int arcadeScreenLeft = 210;
 	_shipsLeft = 3;
 	_alienCounter = 0;
 
@@ -2685,10 +2683,10 @@ void Scene52::run() {
 		while (_vm->isKeyStatus2(Common::KEYCODE_RIGHT)) {
 			update();
 			if (_vm->_gameSys->getAnimationStatus(7) == 2) {
-				if (_shipPosX < _arcadeScreenRight) {
+				if (_shipPosX < arcadeScreenRight) {
 					_shipPosX += 15;
-					if (_shipPosX > _arcadeScreenRight)
-						_shipPosX = _arcadeScreenRight;
+					if (_shipPosX > arcadeScreenRight)
+						_shipPosX = arcadeScreenRight;
 					_vm->_gameSys->setAnimation(_nextUfoSequenceId, 256, 7);
 					_vm->_gameSys->insertSequence(_nextUfoSequenceId, 256, _ufoSequenceId, 256, kSeqSyncWait, 0, _shipPosX, _arcadeScreenBottom);
 					_ufoSequenceId = _nextUfoSequenceId;
@@ -2702,10 +2700,10 @@ void Scene52::run() {
 		while (_vm->isKeyStatus2(Common::KEYCODE_LEFT)) {
 			update();
 			if (_vm->_gameSys->getAnimationStatus(7) == 2) {
-				if (_shipPosX > _arcadeScreenLeft) {
+				if (_shipPosX > arcadeScreenLeft) {
 					_shipPosX -= 15;
-					if (_shipPosX < _arcadeScreenLeft)
-						_shipPosX = _arcadeScreenLeft;
+					if (_shipPosX < arcadeScreenLeft)
+						_shipPosX = arcadeScreenLeft;
 					_vm->_gameSys->setAnimation(_nextUfoSequenceId, 256, 7);
 					_vm->_gameSys->insertSequence(_nextUfoSequenceId, 256, _ufoSequenceId, 256, kSeqSyncWait, 0, _shipPosX, _arcadeScreenBottom);
 					_ufoSequenceId = _nextUfoSequenceId;
diff --git a/engines/gnap/scenes/arcade.h b/engines/gnap/scenes/arcade.h
index e472e00..ab519ee 100644
--- a/engines/gnap/scenes/arcade.h
+++ b/engines/gnap/scenes/arcade.h
@@ -216,8 +216,6 @@ private:
 	int _liveAlienRows;
 	int _gameScore;
 	bool _soundToggle;
-	int _arcadeScreenLeft;
-	int _arcadeScreenRight;
 	int _arcadeScreenBottom;
 	int _shipsLeft;
 	int _shieldSpriteIds[3];