[Scummvm-cvs-logs] scummvm master -> 20a781c02047cc8e2908e77707115db09a9aa59f

sylvaintv sylvaintv at gmail.com
Mon Jun 25 00:50:02 CEST 2012


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:
20a781c020 TOON: Fix bug #3533291 - Crash in Russian Version


Commit: 20a781c02047cc8e2908e77707115db09a9aa59f
    https://github.com/scummvm/scummvm/commit/20a781c02047cc8e2908e77707115db09a9aa59f
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2012-06-24T15:49:33-07:00

Commit Message:
TOON: Fix bug #3533291 - Crash in Russian Version

The Russian-localized version of an animation contained
an empty frame, added a check to skip the rendering.

Bug #3533291: "TOON: Russian Version Crash at Voice Scanner"

Changed paths:
    engines/toon/anim.cpp



diff --git a/engines/toon/anim.cpp b/engines/toon/anim.cpp
index 84f6fa3..a4eb1f2 100644
--- a/engines/toon/anim.cpp
+++ b/engines/toon/anim.cpp
@@ -146,6 +146,9 @@ void Animation::drawFrame(Graphics::Surface &surface, int32 frame, int32 xx, int
 	if (_frames[frame]._ref != -1)
 		frame = _frames[frame]._ref;
 
+	if (!_frames[frame]._data)
+		return;
+
 	int32 rectX = _frames[frame]._x2 - _frames[frame]._x1;
 	int32 rectY = _frames[frame]._y2 - _frames[frame]._y1;
 	int32 offsX = 0;






More information about the Scummvm-git-logs mailing list