[Scummvm-cvs-logs] scummvm master -> 0d1b8211976f604f1a5f5abcbd5f4dc44aecaa9e

Strangerke Strangerke at scummvm.org
Wed May 1 19:12:53 CEST 2013


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:
0d1b821197 HOPKINS: Fix bug#3612423 - Crash while playing 421 using the OS2 Version


Commit: 0d1b8211976f604f1a5f5abcbd5f4dc44aecaa9e
    https://github.com/scummvm/scummvm/commit/0d1b8211976f604f1a5f5abcbd5f4dc44aecaa9e
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-01T10:10:50-07:00

Commit Message:
HOPKINS: Fix bug#3612423 - Crash while playing 421 using the OS2 Version

Changed paths:
    engines/hopkins/script.cpp



diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index ba7954b..051153b 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -1398,7 +1398,10 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 			_vm->_globals->_introSpeechOffFl = true;
 			_vm->_talkMan->startAnimatedCharacterDialogue("tourist1.pe2");
 			_vm->_globals->_introSpeechOffFl = false;
-			_vm->_animMan->playAnim2("T421.ANM", 100, 14, 500);
+			if (_vm->_fileIO->fileExists("T421A.ANM"))
+				_vm->_animMan->playAnim2("T421A.ANM", 100, 14, 500);
+			else
+				_vm->_animMan->playAnim2("T421.ANM", 100, 14, 500);
 			_vm->_events->refreshScreenAndEvents();
 			_vm->_events->refreshScreenAndEvents();
 			_vm->_events->refreshScreenAndEvents();






More information about the Scummvm-git-logs mailing list