libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SHERLOCK: RT: Fix flickering newspaper inside Baker Street

Browse Source
This commit is contained in:
Paul Gilbert 2015-08-21 20:55:31 -04:00
parent 42944eb023
commit 2f077dba80
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/sherlock/tattoo/tattoo_scene.cpp
View File

@ -43,15 +43,16 @@ struct ShapeEntry {
TattooPerson *_person;
bool _isAnimation;
int _yp;
int _objNum;
ShapeEntry(TattooPerson *person, int yp) : _shape(nullptr), _person(person), _yp(yp), _isAnimation(false) {}
ShapeEntry(Object *shape, int yp) : _shape(shape), _person(nullptr), _yp(yp), _isAnimation(false) {}
ShapeEntry(int yp) : _shape(nullptr), _person(nullptr), _yp(yp), _isAnimation(true) {}
ShapeEntry(TattooPerson *person, int yp) : _shape(nullptr), _person(person), _yp(yp), _isAnimation(false), _objNum(-1) {}
ShapeEntry(Object *shape, int yp, int objNum) : _shape(shape), _person(nullptr), _yp(yp), _isAnimation(false), _objNum(objNum) {}
ShapeEntry(int yp) : _shape(nullptr), _person(nullptr), _yp(yp), _isAnimation(true), _objNum(-1) {}
};
typedef Common::List<ShapeEntry> ShapeList;
static bool sortImagesY(const ShapeEntry &s1, const ShapeEntry &s2) {
return s1._yp <= s2._yp;
return s1._yp < s2._yp || (s1._yp == s2._yp && s1._objNum < s2._objNum);
}
/*----------------------------------------------------------------*/
@ -149,10 +150,10 @@ void TattooScene::drawAllShapes() {
if (obj._type == ACTIVE_BG_SHAPE && (obj._misc == NORMAL_BEHIND || obj._misc == NORMAL_FORWARD)) {
if (obj._scaleVal == SCALE_THRESHOLD)
shapeList.push_back(ShapeEntry(&obj, obj._position.y + obj._imageFrame->_offset.y +
obj._imageFrame->_height));
obj._imageFrame->_height, idx));
else
shapeList.push_back(ShapeEntry(&obj, obj._position.y + obj._imageFrame->sDrawYOffset(obj._scaleVal) +
obj._imageFrame->sDrawYSize(obj._scaleVal)));
obj._imageFrame->sDrawYSize(obj._scaleVal), idx));
}
}