ACCESS: Workaround for original setting animations when none is loaded

scummvm · Dec 13, 2014 · 968bfec · 968bfec
1 parent 60ee545
commit 968bfec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp
@@ -304,6 +304,8 @@ void AnimationManager::loadAnimations(Resource *res) {
 
 Animation *AnimationManager::setAnimation(int animId) {
 	Animation *anim = findAnimation(animId);
+	if (!anim)
+		return nullptr;
 
 	anim->_countdownTicks = anim->_initialTicks;
 	anim->_frameNumber = 0;
@@ -320,7 +322,7 @@ void AnimationManager::setAnimTimer(Animation *anim) {
 }
 
 Animation *AnimationManager::findAnimation(int animId) {
-	_animStart = _animation->getAnimation(animId);
+	_animStart = (_animation == nullptr) ? nullptr : _animation->getAnimation(animId);
 	return _animStart;
 }
 

diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
@@ -391,7 +391,9 @@ void Scripts::cmdCheckLoc() {
 void Scripts::cmdSetAnim() { 
 	int animId = _data->readByte();
 	Animation *anim = _vm->_animation->setAnimation(animId);
-	_vm->_animation->setAnimTimer(anim);
+
+	if (anim)
+		_vm->_animation->setAnimTimer(anim);
 }
 
 void Scripts::cmdDispInv() {