thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GOB: Fix invalid reads in Geisha's minigames

Browse source
This commit is contained in:
Sven Hesse 2012-06-03 18:58:03 +02:00
parent d124b87649
commit db99d23717
4 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
engines/gob/aniobject.cpp
View file

@ -167,19 +167,21 @@ bool ANIObject::isIn(const ANIObject &obj) const {
obj.isIn(frameX + frameWidth - 1, frameY + frameHeight - 1);
}
void ANIObject::draw(Surface &dest, int16 &left, int16 &top,
bool ANIObject::draw(Surface &dest, int16 &left, int16 &top,
int16 &right, int16 &bottom) {
if (!_visible)
return;
return false;
if (_cmp)
drawCMP(dest, left, top, right, bottom);
return drawCMP(dest, left, top, right, bottom);
else if (_ani)
drawANI(dest, left, top, right, bottom);
return drawANI(dest, left, top, right, bottom);
return false;
}
void ANIObject::drawCMP(Surface &dest, int16 &left, int16 &top,
bool ANIObject::drawCMP(Surface &dest, int16 &left, int16 &top,
int16 &right, int16 &bottom) {
if (!_background) {
@ -209,9 +211,11 @@ void ANIObject::drawCMP(Surface &dest, int16 &left, int16 &top,
top = _backgroundTop;
right = _backgroundRight;
bottom = _backgroundBottom;
return true;
}
void ANIObject::drawANI(Surface &dest, int16 &left, int16 &top,
bool ANIObject::drawANI(Surface &dest, int16 &left, int16 &top,
int16 &right, int16 &bottom) {
if (!_background) {
@ -224,7 +228,7 @@ void ANIObject::drawANI(Surface &dest, int16 &left, int16 &top,
const ANIFile::Animation &animation = _ani->getAnimationInfo(_animation);
if (_frame >= animation.frameCount)
return;
return false;
const ANIFile::FrameArea &area = animation.frameAreas[_frame];
@ -244,13 +248,15 @@ void ANIObject::drawANI(Surface &dest, int16 &left, int16 &top,
top = _backgroundTop;
right = _backgroundRight;
bottom = _backgroundBottom;
return true;
}
void ANIObject::clear(Surface &dest, int16 &left, int16 &top,
bool ANIObject::clear(Surface &dest, int16 &left, int16 &top,
int16 &right, int16 &bottom) {
if (!_drawn)
return;
return false;
const int16 bgRight = _backgroundRight - _backgroundLeft;
const int16 bgBottom = _backgroundBottom - _backgroundTop;
@ -263,6 +269,8 @@ void ANIObject::clear(Surface &dest, int16 &left, int16 &top,
top = _backgroundTop;
right = _backgroundRight;
bottom = _backgroundBottom;
return true;
}
void ANIObject::advance() {