[Scummvm-cvs-logs] scummvm master -> cc11941203f5058bea73bf709478854746d7ea60
dreammaster
dreammaster at scummvm.org
Sat May 14 04:19:13 CEST 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:
cc11941203 ACCESS: Fix crash at end of AGOE floppy chapter 6
Commit: cc11941203f5058bea73bf709478854746d7ea60
https://github.com/scummvm/scummvm/commit/cc11941203f5058bea73bf709478854746d7ea60
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-05-13T22:19:03-04:00
Commit Message:
ACCESS: Fix crash at end of AGOE floppy chapter 6
Changed paths:
engines/access/amazon/amazon_logic.cpp
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index e78f92c..08006fe 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -185,16 +185,24 @@ void CampScene::mWhileDoOpen() {
_vm->_numAnimTimers = 0;
_vm->_images.clear();
- if (_vm->_conversation == 2) {
- // Cutscene at end of Chapter 6
- Resource *spriteData = _vm->_files->loadFile(28, 37);
- _vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
- delete spriteData;
-
- _vm->_animation->freeAnimationData();
- animResource = _vm->_files->loadFile(28, 38);
- _vm->_animation->loadAnimations(animResource);
- delete animResource;
+ if (_vm->isCD()) {
+ if (_vm->_conversation == 2) {
+ // Cutscene at end of Chapter 6
+ Resource *spriteData = _vm->_files->loadFile(28, 37);
+ _vm->_objectsTable[28] = new SpriteResource(_vm, spriteData);
+ delete spriteData;
+
+ _vm->_animation->freeAnimationData();
+ animResource = _vm->_files->loadFile(28, 38);
+ _vm->_animation->loadAnimations(animResource);
+ delete animResource;
+ }
+ } else {
+ _vm->freeCells();
+ _vm->_oldRects.clear();
+ _vm->_newRects.clear();
+ _vm->_numAnimTimers = 0;
+ _vm->_images.clear();
}
}
More information about the Scummvm-git-logs
mailing list