ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACCESS: Workaround for original setting animations when none is loaded

Browse Source
This commit is contained in:
Paul Gilbert
2014-12-12 22:36:46 -05:00
parent 60ee5456c9
commit 968bfec067
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/access/animation.cpp
+3 -1
View File
@@ -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;
}
engines/access/scripts.cpp
+3 -1
View File
@@ -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() {