mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-16 06:39:17 +00:00
Objects in Mickey's Space Adventure are shown correctly now
svn-id: r29612
This commit is contained in:
parent
78d347e008
commit
cd3f548407
@ -228,6 +228,9 @@ void PictureMgr::absoluteDrawLine() {
|
||||
INLINE int PictureMgr::isOkFillHere(int x, int y) {
|
||||
uint8 p;
|
||||
|
||||
x += _xOffset;
|
||||
y += _yOffset;
|
||||
|
||||
if (x < 0 || x >= _width || y < 0 || y >= _height)
|
||||
return false;
|
||||
|
||||
|
@ -664,14 +664,6 @@ void Mickey::drawObj(ENUM_MSA_OBJECT iObj, int x0, int y0) {
|
||||
|
||||
if (iObj == IDI_MSA_OBJECT_CRYSTAL)
|
||||
_vm->_picture->setPictureFlags(kPicFStep);
|
||||
|
||||
// HACK: attempting to draw the scale in Mickey's house causes a crash, so we don't draw it
|
||||
if (iObj == IDI_MSA_OBJECT_SCALE)
|
||||
return;
|
||||
|
||||
// HACK: attempting to draw the rock in Jupiter causes a crash, so we don't draw it
|
||||
if (iObj == IDI_MSA_OBJECT_ROCK_1 || iObj == IDI_MSA_OBJECT_ROCK_2 || iObj == IDI_MSA_OBJECT_ROCK_3)
|
||||
return;
|
||||
|
||||
_vm->_picture->setOffset(x0, y0);
|
||||
_vm->_picture->decodePicture(buffer, size, false, IDI_MSA_PIC_WIDTH, IDI_MSA_PIC_HEIGHT);
|
||||
|
Loading…
Reference in New Issue
Block a user