diff options
| author | Eugene Sandulenko | 2013-09-04 22:13:55 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-06 14:51:25 +0300 |
| commit | 8ea65ec40f5ab3422a415be8c1e08185ea60ed05 (patch) | |
| tree | 83050e981f67702013e5aa562a30829e1757ecc4 | |
| parent | d0484467688e896937f232766e9104bbd3377144 (diff) | |
| download | scummvm-rg350-8ea65ec40f5ab3422a415be8c1e08185ea60ed05.tar.gz scummvm-rg350-8ea65ec40f5ab3422a415be8c1e08185ea60ed05.tar.bz2 scummvm-rg350-8ea65ec40f5ab3422a415be8c1e08185ea60ed05.zip | |
FULLPIPE: Fix *AtPos() functions
| -rw-r--r-- | engines/fullpipe/scene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index b92b66ded6..66e5ee3f80 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -483,7 +483,7 @@ StaticANIObject *Scene::getStaticANIObjectAtPos(int x, int y) { StaticANIObject *p = (StaticANIObject *)_staticANIObjectList1[i]; int pixel; - if ((p->_field_8 & 1) && (p->_flags & 4) && + if ((p->_field_8 & 0x100) && (p->_flags & 4) && p->getPixelAtPos(x, y, &pixel) && (!res || res->_priority >= p->_priority)) res = p; @@ -497,7 +497,7 @@ PictureObject *Scene::getPictureObjectAtPos(int x, int y) { for (uint i = 0; i < _picObjList.size(); i++) { PictureObject *p = (PictureObject *)_picObjList[i]; - if ((p->_field_8 & 1) && (p->_flags & 4) && + if ((p->_field_8 & 0x100) && (p->_flags & 4) && p->isPixelHitAtPos(x, y) && (!res || res->_priority >= p->_priority)) res = p; @@ -512,7 +512,7 @@ int Scene::getPictureObjectIdAtPos(int x, int y) { for (uint i = 0; i < _picObjList.size(); i++) { PictureObject *p = (PictureObject *)_picObjList[i]; - if ((p->_field_8 & 1) && (p->_flags & 4) && + if ((p->_field_8 & 0x100) && (p->_flags & 4) && p->isPixelHitAtPos(x, y) && (!res || resp->_priority >= p->_priority)) { resp = p; |