[Scummvm-git-logs] scummvm master -> a854c7e274e1cd5ed77b219762eea6d4d67c47be
csnover
csnover at users.noreply.github.com
Mon Oct 17 04:21:20 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a854c7e274 SCI32: Fix screen items incorrectly drawing over higher planes
Commit: a854c7e274e1cd5ed77b219762eea6d4d67c47be
https://github.com/scummvm/scummvm/commit/a854c7e274e1cd5ed77b219762eea6d4d67c47be
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-16T21:21:13-05:00
Commit Message:
SCI32: Fix screen items incorrectly drawing over higher planes
Fixes Trac#9583.
Changed paths:
engines/sci/graphics/plane32.cpp
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index e7da8b8..7dfaed4 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -191,7 +191,7 @@ void Plane::addPicInternal(const GuiResourceId pictureId, const Common::Point *p
delete screenItem->_celObj;
screenItem->_celObj = celObj;
}
- _type = transparent ? kPlaneTypeTransparentPicture : kPlaneTypePicture;
+ _type = (getSciVersion() == SCI_VERSION_3 && transparent) ? kPlaneTypeTransparentPicture : kPlaneTypePicture;
}
GuiResourceId Plane::addPic(const GuiResourceId pictureId, const Common::Point &position, const bool mirrorX, const bool deleteDuplicate) {
@@ -751,8 +751,12 @@ void Plane::setType() {
_type = kPlaneTypeOpaque;
break;
case kPlanePicTransparentPicture:
- _type = kPlaneTypeTransparentPicture;
- break;
+ if (getSciVersion() == SCI_VERSION_3) {
+ warning("TODO: Using transparent picture plane. Rendering may be incomplete");
+ _type = kPlaneTypeTransparentPicture;
+ break;
+ }
+ // fall through for sci2/2.1
default:
if (_type != kPlaneTypeTransparentPicture) {
_type = kPlaneTypePicture;
More information about the Scummvm-git-logs
mailing list