[Scummvm-git-logs] scummvm master -> 1694680acea712db0149c74de412e309dbd0c1cc

athrxx athrxx at scummvm.org
Sat Aug 27 22:15:18 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:
1694680ace KYRA: (LOL) -  fix #7183 (LOL-CD: game crashes and exits when looking/picking item)


Commit: 1694680acea712db0149c74de412e309dbd0c1cc
    https://github.com/scummvm/scummvm/commit/1694680acea712db0149c74de412e309dbd0c1cc
Author: athrxx (athrxx at scummvm.org)
Date: 2016-08-27T22:09:37+02:00

Commit Message:
KYRA: (LOL) -  fix #7183 (LOL-CD: game crashes and exits when looking/picking item)

Changed paths:
    engines/kyra/animator_tim.cpp



diff --git a/engines/kyra/animator_tim.cpp b/engines/kyra/animator_tim.cpp
index 1d65ba7..b1cfc6a 100644
--- a/engines/kyra/animator_tim.cpp
+++ b/engines/kyra/animator_tim.cpp
@@ -202,6 +202,9 @@ void TimAnimator::playPart(int animIndex, int firstFrame, int lastFrame, int del
 		return;
 
 	Animation *anim = &_animations[animIndex];
+	// WORKAROUND for some bugged scripts that will try to play invalid animations
+	if (!anim->wsa)
+		return;
 
 	int step = (lastFrame >= firstFrame) ? 1 : -1;
 	for (int i = firstFrame; i != (lastFrame + step); i += step) {





More information about the Scummvm-git-logs mailing list