[Scummvm-cvs-logs] scummvm master -> 07f82d0b38940ba284bc10b0ab8ddeceb6ac1a13

Strangerke Strangerke at scummvm.org
Mon Jan 11 07:05:36 CET 2016


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:
07f82d0b38 MADS: dragonsphere - Remove dead code in Scene102::step()


Commit: 07f82d0b38940ba284bc10b0ab8ddeceb6ac1a13
    https://github.com/scummvm/scummvm/commit/07f82d0b38940ba284bc10b0ab8ddeceb6ac1a13
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-11T06:59:10+01:00

Commit Message:
MADS: dragonsphere - Remove dead code in Scene102::step()

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 ee32a0f..5fdf201 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
@@ -305,12 +305,9 @@ void Scene102::enter() {
 }
 
 void Scene102::step() {
-	int resetFrame;
-
 	if ((_animRunning == 1) && _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:
@@ -331,13 +328,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;
-				}
-			}
 		}
 	}
 






More information about the Scummvm-git-logs mailing list