aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/plane32.cpp
diff options
context:
space:
mode:
authorColin Snover2016-07-25 11:06:27 -0500
committerColin Snover2016-08-01 10:37:14 -0500
commit156c68fe58eb9f8d923d1f9dc1c3dac8436c9d82 (patch)
tree12b08a5cbc9dc2487ac3dc6a0eefc48317ff41f9 /engines/sci/graphics/plane32.cpp
parent4a637d65c36d7dad3a4d4ec75c243e12bb3b5449 (diff)
downloadscummvm-rg350-156c68fe58eb9f8d923d1f9dc1c3dac8436c9d82.tar.gz
scummvm-rg350-156c68fe58eb9f8d923d1f9dc1c3dac8436c9d82.tar.bz2
scummvm-rg350-156c68fe58eb9f8d923d1f9dc1c3dac8436c9d82.zip
SCI32: Implement plane transitions (kSetShowStyle and kSetScroll)
This commit implements all of the known plane transitions from SCI2 through SCI2.1mid games. Because kSetShowStyle is always called indirectly via the Styler game script, it is difficult to find all the places where transitions are used. As such, transitions that appeared to never be used have been added as stubs which will trigger a game crash with a message to report what was being done, so any missed transition types can be identified quickly and then implemented.
Diffstat (limited to 'engines/sci/graphics/plane32.cpp')
-rw-r--r--engines/sci/graphics/plane32.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index 6b05b2d98a..cb6ec74e8f 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -194,11 +194,11 @@ void Plane::addPicInternal(const GuiResourceId pictureId, const Common::Point *p
_type = transparent ? kPlaneTypeTransparentPicture : kPlaneTypePicture;
}
-void Plane::addPic(const GuiResourceId pictureId, const Common::Point &position, const bool mirrorX) {
+GuiResourceId Plane::addPic(const GuiResourceId pictureId, const Common::Point &position, const bool mirrorX) {
+ GuiResourceId oldPictureId = _pictureId;
deletePic(pictureId);
addPicInternal(pictureId, &position, mirrorX);
- // NOTE: In SCI engine this method returned the pictureId of the
- // plane, but this return value was never used
+ return oldPictureId;
}
void Plane::changePic() {