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

[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:
c20fabb980 MADS: Remove obsolete comment in scene 608
b035333dfd MADS: Remove dead code in scene 608, some rework


Commit: c20fabb98082fe9237504b80e4f4049bd0fc687c
    https://github.com/scummvm/scummvm/commit/c20fabb98082fe9237504b80e4f4049bd0fc687c
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-26T22:14:50+02:00

Commit Message:
MADS: Remove obsolete comment in scene 608

Changed paths:
    engines/mads/nebular/nebular_scenes6.cpp



diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index fb1fcf5..feb2725 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -1892,7 +1892,6 @@ void Scene608::step() {
 		_dogTimer2 = _scene->_frameStartTime;
 	}
 
-	// CHECKME: _checkFl is always false?
 	if (_dogRunTimer >= 480 && !_checkFl && !_buttonPressedonTimeFl && !_dogFirstEncounter && _dogUnderCar && _dogActiveFl) {
 		_checkFl = true;
 		_dogSquashFl = false;
@@ -1988,7 +1987,6 @@ void Scene608::step() {
 				_nextTrigger = 2;
 			}
 
-
 			if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
 				_scene->_activeAnimation->setCurrentFrame(nextFrame);
 				_carFrame = nextFrame;


Commit: b035333dfd67a4d14b6ae73d3bd293a751e5df97
    https://github.com/scummvm/scummvm/commit/b035333dfd67a4d14b6ae73d3bd293a751e5df97
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-26T22:14:51+02:00

Commit Message:
MADS: Remove dead code in scene 608, some rework

Changed paths:
    engines/mads/nebular/nebular_scenes6.cpp



diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index feb2725..8101428 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -1925,72 +1925,46 @@ void Scene608::step() {
 	if ((_carMode == 4) && (_scene->_activeAnimation != nullptr)) {
 		if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
 			_carFrame = _scene->_activeAnimation->getCurrentFrame();
-			int nextFrame = -1;
 
 			if (_carFrame == 10) {
 				_game._player._visible = true;
 				_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
-			}
-
-			if (_carFrame == 56) {
+			} else if (_carFrame == 56) {
 				resetDogVariables();
 				_animationMode = 0;
 				_nextTrigger = 2;
 			}
-
-			if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
-				_scene->_activeAnimation->setCurrentFrame(nextFrame);
-				_carFrame = nextFrame;
-			}
 		}
 	}
 
 	if ((_carMode == 5) && (_scene->_activeAnimation != nullptr)) {
 		if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
 			_carFrame = _scene->_activeAnimation->getCurrentFrame();
-			int nextFrame = -1;
-
 			if (_carFrame == 10) {
 				_game._player._visible = true;
 				_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
-			}
-
-			if (_carFrame == 52) {
+			} else if (_carFrame == 52) {
 				resetDogVariables();
 				_animationMode = 0;
 				_nextTrigger = 2;
 			}
-
-			if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
-				_scene->_activeAnimation->setCurrentFrame(nextFrame);
-				_carFrame = nextFrame;
-			}
 		}
 	}
 
-
 	if ((_carMode == 6) && (_scene->_activeAnimation != nullptr)) {
 		if (_scene->_activeAnimation->getCurrentFrame() != _carFrame) {
 			_carFrame = _scene->_activeAnimation->getCurrentFrame();
-			int nextFrame = -1;
 
 			if (_carFrame == 11) {
 				_game._player._visible = true;
 				_game._player._priorTimer = _scene->_activeAnimation->getNextFrameTimer() - _game._player._ticksAmount;
-			}
-
-			if (_carFrame == 41) {
+			} else if (_carFrame == 41) {
 				_globals._sequenceIndexes[10] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[10], false, 9, 0, 0, 0);
 				_scene->_sequences.setAnimRange(_globals._sequenceIndexes[10], 10, 11);
 				_scene->_sequences.setDepth(_globals._sequenceIndexes[10], 6);
 				_dogUnderCar = true;
 				_nextTrigger = 2;
 			}
-
-			if ((nextFrame >= 0) && (nextFrame != _scene->_activeAnimation->getCurrentFrame())) {
-				_scene->_activeAnimation->setCurrentFrame(nextFrame);
-				_carFrame = nextFrame;
-			}
 		}
 	}