[Scummvm-git-logs] scummvm master -> af5dcd4ba15e1364b21f679f66a658b8e25685b2
sev-
sev at scummvm.org
Sun Aug 28 20:05:46 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6611589905 FULLPIPE: Fix alpha mask in Bitmap::isPixelHitAtPos
af5dcd4ba1 FULLPIPE: Fix priority check in Scene::getStaticANIObjectAtPos
Commit: 6611589905793396aa9cc2a4a8152bca48188a8e
https://github.com/scummvm/scummvm/commit/6611589905793396aa9cc2a4a8152bca48188a8e
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-28T20:05:21+02:00
Commit Message:
FULLPIPE: Fix alpha mask in Bitmap::isPixelHitAtPos
Changed paths:
engines/fullpipe/gfx.cpp
diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 174f66a..23cef90 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -806,7 +806,7 @@ bool Bitmap::isPixelHitAtPos(int x, int y) {
if (!_surface)
return false;
- return ((*((int32 *)_surface->getBasePtr(x - _x, y - _y)) & 0xff000000) != 0);
+ return ((*((int32 *)_surface->getBasePtr(x - _x, y - _y)) & 0xff) != 0);
}
void Bitmap::decode(int32 *palette) {
Commit: af5dcd4ba15e1364b21f679f66a658b8e25685b2
https://github.com/scummvm/scummvm/commit/af5dcd4ba15e1364b21f679f66a658b8e25685b2
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-28T20:05:28+02:00
Commit Message:
FULLPIPE: Fix priority check in Scene::getStaticANIObjectAtPos
Changed paths:
engines/fullpipe/scene.cpp
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index b47988d..70f5f1a 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -601,7 +601,7 @@ StaticANIObject *Scene::getStaticANIObjectAtPos(int x, int y) {
if ((p->_field_8 & 0x100) && (p->_flags & 4) &&
p->getPixelAtPos(x, y, &pixel) &&
- (!res || res->_priority >= p->_priority))
+ (!res || res->_priority > p->_priority))
res = p;
}
More information about the Scummvm-git-logs
mailing list