Objects in Mickey's Space Adventure are shown correctly now

svn-id: r29612
This commit is contained in:
Filippos Karapetis 2007-11-22 20:54:46 +00:00
parent 78d347e008
commit cd3f548407
2 changed files with 3 additions and 8 deletions

View File

@ -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;

View File

@ -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);