[Scummvm-git-logs] scummvm master -> 79102d87ec67f221e7d78f1e1928926cc04a3a24
bgK
bastien.bouclet at gmail.com
Thu Aug 10 21:09:39 CEST 2017
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:
fb26a42aad MOHAWK: Myst: Restore the backbuffer after toggling off fireplace buttons
79102d87ec MOHAWK: Myst: Fix showing the white page after dropping it
Commit: fb26a42aad0ec1c5b6d1fb141446ec158995995d
https://github.com/scummvm/scummvm/commit/fb26a42aad0ec1c5b6d1fb141446ec158995995d
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-08-10T20:52:23+02:00
Commit Message:
MOHAWK: Myst: Restore the backbuffer after toggling off fireplace buttons
Fixes #10064
Changed paths:
engines/mohawk/myst_stacks/myst.cpp
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 1ee8420..dbc4ff5 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -843,6 +843,7 @@ void Myst::o_fireplaceToggleButton(uint16 var, const ArgumentsArray &args) {
// Used on Myst Card 4162 (Fireplace Grid)
uint16 bitmask = args[0];
uint16 line = _fireplaceLines[var - 17];
+ Common::Rect buttonRect = getInvokingResource<MystArea>()->getRect();
// The animations are too slow when playing each animation image at 60fps.
// Only play every second image.
@@ -850,14 +851,15 @@ void Myst::o_fireplaceToggleButton(uint16 var, const ArgumentsArray &args) {
if (line & bitmask) {
// Unset button
for (uint i = 4795; i >= 4779; i -= 2) {
- _vm->_gfx->copyImageToScreen(i, getInvokingResource<MystArea>()->getRect());
+ _vm->_gfx->copyImageToScreen(i, buttonRect);
_vm->doFrame();
}
+ _vm->_gfx->copyBackBufferToScreen(buttonRect);
_fireplaceLines[var - 17] &= ~bitmask;
} else {
// Set button
for (uint i = 4779; i <= 4795; i += 2) {
- _vm->_gfx->copyImageToScreen(i, getInvokingResource<MystArea>()->getRect());
+ _vm->_gfx->copyImageToScreen(i, buttonRect);
_vm->doFrame();
}
_fireplaceLines[var - 17] |= bitmask;
Commit: 79102d87ec67f221e7d78f1e1928926cc04a3a24
https://github.com/scummvm/scummvm/commit/79102d87ec67f221e7d78f1e1928926cc04a3a24
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-08-10T21:02:10+02:00
Commit Message:
MOHAWK: Myst: Fix showing the white page after dropping it
Fixes #10065.
Changed paths:
engines/mohawk/myst.cpp
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 505d284..e229faf 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -1240,6 +1240,7 @@ void MohawkEngine_Myst::dropPage() {
// Redraw page area
if (whitePage && _gameState->_globals.currentAge == 2) {
+ _scriptParser->toggleVar(41);
redrawArea(41);
} else if (bluePage) {
if (page == 6) {
More information about the Scummvm-git-logs
mailing list