[Scummvm-cvs-logs] scummvm master -> 38a90947fe90aebfffed045d0c36ab3a11e74d84

[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:
38a90947fe HOPKINS: Remove duplicated code in AnimationManager.


Commit: 38a90947fe90aebfffed045d0c36ab3a11e74d84
    https://github.com/scummvm/scummvm/commit/38a90947fe90aebfffed045d0c36ab3a11e74d84
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-23T07:00:55-07:00

Commit Message:
HOPKINS: Remove duplicated code in AnimationManager.

"noColFl" is only 'true' in one animation of the full game, so the code after the check isn't used in the demo.

Changed paths:
    engines/hopkins/anim.cpp



diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 090117b..8967281 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -660,40 +660,22 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
 		_vm->_graphicsManager->updateScreen();
 	}
 	bool skipFl = false;
-	if (_vm->getIsDemo()) {
-		_vm->_eventsManager->_rateCounter = 0;
-		_vm->_eventsManager->_escKeyFl = false;
-		_vm->_soundManager->loadAnimSound();
-		if (_vm->_globals->iRegul == 1) {
-			do {
-				if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) {
-					skipFl = true;
-					break;
-				}
-
-				_vm->_eventsManager->_escKeyFl = false;
-				_vm->_eventsManager->refreshEvents();
-				_vm->_soundManager->checkSoundEnd();
-			} while (_vm->_eventsManager->_rateCounter < rate1);
-		}
-	} else {
-		if (noColFl)
-			_vm->_graphicsManager->fadeInDefaultLength(screenP);
-		_vm->_eventsManager->_rateCounter = 0;
-		_vm->_eventsManager->_escKeyFl = false;
-		_vm->_soundManager->loadAnimSound();
-		if (_vm->_globals->iRegul == 1) {
-			do {
-				if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) {
-					skipFl = true;
-					break;
-				}
+	if (noColFl)
+		_vm->_graphicsManager->fadeInDefaultLength(screenP);
+	_vm->_eventsManager->_rateCounter = 0;
+	_vm->_eventsManager->_escKeyFl = false;
+	_vm->_soundManager->loadAnimSound();
+	if (_vm->_globals->iRegul == 1) {
+		do {
+			if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) {
+				skipFl = true;
+				break;
+			}
 
-				_vm->_eventsManager->_escKeyFl = false;
-				_vm->_eventsManager->refreshEvents();
-				_vm->_soundManager->checkSoundEnd();
-			} while (_vm->_eventsManager->_rateCounter < rate1);
-		}
+			_vm->_eventsManager->_escKeyFl = false;
+			_vm->_eventsManager->refreshEvents();
+			_vm->_soundManager->checkSoundEnd();
+		} while (_vm->_eventsManager->_rateCounter < rate1);
 	}
 	_vm->_eventsManager->_rateCounter = 0;
 	if (!skipFl) {