diff options
author | Bastien Bouclet | 2016-02-27 15:58:54 +0100 |
---|---|---|
committer | Bastien Bouclet | 2016-03-05 14:43:10 +0100 |
commit | 3552a185f1ac3bed9e4e5c707f3f9687905bafb3 (patch) | |
tree | b7683403d42ed37204740d8648a3fec993ee547b /engines/mohawk/myst_stacks | |
parent | e63cbdb6a7f79aeb25b2053197e060dca548a940 (diff) | |
download | scummvm-rg350-3552a185f1ac3bed9e4e5c707f3f9687905bafb3.tar.gz scummvm-rg350-3552a185f1ac3bed9e4e5c707f3f9687905bafb3.tar.bz2 scummvm-rg350-3552a185f1ac3bed9e4e5c707f3f9687905bafb3.zip |
MOHAWK: Adjust the Myst gauge boiler movie to the new VideoHandle semantics
Fixes it not being updated.
Diffstat (limited to 'engines/mohawk/myst_stacks')
-rw-r--r-- | engines/mohawk/myst_stacks/myst.cpp | 7 | ||||
-rw-r--r-- | engines/mohawk/myst_stacks/myst.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 5033f0fef8..6ce7d48ce6 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -52,6 +52,7 @@ Myst::Myst(MohawkEngine_Myst *vm) : _cabinDoorOpened = 0; _cabinHandleDown = 0; _cabinMatchState = 2; + _cabinGaugeMovieEnabled = false; _matchBurning = false; _tree = nullptr; _treeAlcove = nullptr; @@ -2142,7 +2143,7 @@ void Myst::tree_run() { // Check if alcove is accessible treeSetAlcoveAccessible(); - if (_cabinGaugeMovie) { + if (_cabinGaugeMovieEnabled) { Common::Rational rate = boilerComputeGaugeRate(pressure, delay); boilerResetGauge(rate); } @@ -3703,6 +3704,8 @@ void Myst::boilerGaugeInit() { frame = Audio::Timestamp(0, 0, 600); _vm->_video->drawVideoFrame(_cabinGaugeMovie, frame); + + _cabinGaugeMovieEnabled = true; } void Myst::o_rocketSliders_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) { @@ -3842,6 +3845,8 @@ void Myst::o_boiler_exit(uint16 op, uint16 var, uint16 argc, uint16 *argv) { _cabinGaugeMovie = VideoHandle(); _cabinFireMovie = VideoHandle(); + + _cabinGaugeMovieEnabled = false; } void Myst::o_generatorControlRoom_exit(uint16 op, uint16 var, uint16 argc, uint16 *argv) { diff --git a/engines/mohawk/myst_stacks/myst.h b/engines/mohawk/myst_stacks/myst.h index 9d66b798c5..6e2f7cc1c8 100644 --- a/engines/mohawk/myst_stacks/myst.h +++ b/engines/mohawk/myst_stacks/myst.h @@ -261,6 +261,8 @@ protected: uint32 _matchGoOutTime; // 144 VideoHandle _cabinFireMovie; // 240 + + bool _cabinGaugeMovieEnabled; VideoHandle _cabinGaugeMovie; // 244 bool _boilerPressureIncreasing; |