diff options
| author | Filippos Karapetis | 2007-11-22 20:54:46 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-11-22 20:54:46 +0000 |
| commit | cd3f548407f90128c95deda368f3fd46613e1d5d (patch) | |
| tree | b4676ac03d2ee65e48fa215e8c5ef004c7955bfb | |
| parent | 78d347e00832648ef160d8a7f76127dec312ce68 (diff) | |
| download | scummvm-rg350-cd3f548407f90128c95deda368f3fd46613e1d5d.tar.gz scummvm-rg350-cd3f548407f90128c95deda368f3fd46613e1d5d.tar.bz2 scummvm-rg350-cd3f548407f90128c95deda368f3fd46613e1d5d.zip | |
Objects in Mickey's Space Adventure are shown correctly now
svn-id: r29612
| -rw-r--r-- | engines/agi/picture.cpp | 3 | ||||
| -rw-r--r-- | engines/agi/preagi_mickey.cpp | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index 60a1bd0f91..62de1ef233 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -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; diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 434befeb9b..9deee9208d 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -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); |