[Scummvm-cvs-logs] scummvm master -> 7bd77c56369a54a2a49ebde658b6bbfce69ff172

[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:
7bd77c5636 MADS: Dragon: Remove some dead code in hardcoded logic


Commit: 7bd77c56369a54a2a49ebde658b6bbfce69ff172
    https://github.com/scummvm/scummvm/commit/7bd77c56369a54a2a49ebde658b6bbfce69ff172
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-24T17:15:53+01:00

Commit Message:
MADS: Dragon: Remove some dead code in hardcoded logic

Changed paths:
    engines/mads/dragonsphere/dragonsphere_scenes1.cpp



diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
index 7abb460..8a89d8e 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
@@ -344,7 +344,6 @@ void Scene102::step() {
 	if ((_animRunning == 2) && _scene->_animation[_globals._animationIndexes[0]]) {
 		if (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() != _diaryFrame) {
 			_diaryFrame = _scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame();
-			resetFrame = -1;
 
 			switch (_diaryFrame) {
 			case 6:
@@ -360,13 +359,6 @@ void Scene102::step() {
 			default:
 				break;
 			}
-
-			if (resetFrame >= 0) {
-				if (resetFrame != _scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame()) {
-					_scene->setAnimFrame(_globals._animationIndexes[0], resetFrame);
-					_diaryFrame = resetFrame;
-				}
-			}
 		}
 	}
 
@@ -1389,17 +1381,11 @@ void Scene104::step() {
 	if ((_animationRunning == 1) && _scene->_animation[_globals._animationIndexes[0]]) {
 		if (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() != _tapestryFrame) {
 			_tapestryFrame = _scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame();
-			int resetFrame = -1;
 
 			if (_tapestryFrame == 13) {
 				_game._player._visible = true;
 				_game.syncTimers(SYNC_PLAYER, 0, SYNC_ANIM, _globals._animationIndexes[0]);
 			}
-
-			if ((resetFrame >= 0) && (resetFrame != _scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame())) {
-				_scene->setAnimFrame(_globals._animationIndexes[0], resetFrame);
-				_tapestryFrame = resetFrame;
-			}
 		}
 	}
 
@@ -2925,17 +2911,11 @@ void Scene104::handleDeathAnimation() {
 		return;
 
 	_deathFrame = _scene->_animation[_globals._animationIndexes[4]]->getCurrentFrame();
-	int resetFrame = -1;
 
 	if (_deathFrame == 11)
 		_scene->playSpeech(7);
 	else if (_deathFrame == 17)
 		_scene->playSpeech(6);
-
-	if (resetFrame >= 0) {
-		_scene->setAnimFrame(_globals._animationIndexes[4], resetFrame);
-		_deathFrame = resetFrame;
-	}
 }
 
 void Scene104::handlePidAnimation() {