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

Now clipping frame # to avoid crashes because of bad behavior of game scripts.

Browse Source 
svn-id: r27683
This commit is contained in:
Nicola Mettifogo committed 2007-06-23 21:42:45 +00:00
1 parent 90c2210dae
commit 2fb22f2eea
1 file changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files
engines/parallaction/animation.cpp
+7 -3
View File
@@ -166,15 +166,19 @@ void jobDisplayAnimations(void *parm, Job *j) {
if ((v18->_flags & kFlagsActive) && ((v18->_flags & kFlagsRemove) == 0)) {
v14._width = v18->width();
v14._height = v18->height();
v14._data0 = v18->getFrameData(v18->_frame);
// v14._data1 = v18->_cnv->field_8[v18->_frame];
int16 frame = CLIP((int)v18->_frame, 0, v18->getFrameNum()-1);
v14._data0 = v18->getFrameData(frame);
// v14._data1 = v18->_cnv->field_8[frame];
if (v18->_flags & kFlagsNoMasked)
_si = 3;
else
_si = _vm->_gfx->queryMask(v18->_top + v18->height());
debugC(9, kDebugLocation, "jobDisplayAnimations(%s, x:%i, y:%i, z:%i, w:%i, h:%i, %p)", v18->_label._text, v18->_left, v18->_top, _si, v14._width, v14._height, v14._data0);
debugC(9, kDebugLocation, "jobDisplayAnimations(%s, x:%i, y:%i, z:%i, w:%i, h:%i, f:%i/%i, %p)", v18->_label._text, v18->_left, v18->_top, _si, v14._width, v14._height,
frame, v18->getFrameNum(), v14._data0);
_vm->_gfx->blitCnv(&v14, v18->_left, v18->_top, _si, Gfx::kBitBack);
}