thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Add a workaround for Myst ME fortress rotation bug

Browse source
This commit is contained in:
Bastien Bouclet 2012-12-15 09:59:25 +01:00
parent e0c923fd5a
commit fb02d1decd
2 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
engines/mohawk/myst_stacks/mechanical.cpp
View file

@ -44,6 +44,10 @@ Mechanical::Mechanical(MohawkEngine_Myst *vm) :
_fortressRotationSpeed = 0; _fortressRotationSpeed = 0;
_fortressSimulationSpeed = 0; _fortressSimulationSpeed = 0;
_gearsWereRunning = false; _gearsWereRunning = false;
_fortressRotationShortMovieWorkaround = false;
_fortressRotationShortMovieCount = 0;
_fortressRotationShortMovieLast = 0;
} }
Mechanical::~Mechanical() { Mechanical::~Mechanical() {
@ -785,6 +789,20 @@ void Mechanical::fortressRotation_run() {
uint32 moviePosition = Audio::Timestamp(_vm->_video->getTime(gears), 600).totalNumberOfFrames(); uint32 moviePosition = Audio::Timestamp(_vm->_video->getTime(gears), 600).totalNumberOfFrames();
// Myst ME short movie workaround, explained in o_fortressRotation_init
if (_fortressRotationShortMovieWorkaround) {
// Detect if we just looped
if (ABS<int32>(_fortressRotationShortMovieLast - 3680) < 50
&& ABS<int32>(moviePosition) < 50) {
_fortressRotationShortMovieCount++;
}
_fortressRotationShortMovieLast = moviePosition;
// Simulate longer movie
moviePosition += 3600 * _fortressRotationShortMovieCount;
}
int32 positionInQuarter = 900 - (moviePosition + 900) % 1800; int32 positionInQuarter = 900 - (moviePosition + 900) % 1800;
// Are the gears moving? // Are the gears moving?
@ -824,7 +842,13 @@ void Mechanical::fortressRotation_run() {
_fortressPosition = (moviePosition + 900) / 1800 % 4; _fortressPosition = (moviePosition + 900) / 1800 % 4;
_vm->_video->setVideoRate(gears, 0); _vm->_video->setVideoRate(gears, 0);
if (!_fortressRotationShortMovieWorkaround) {
_vm->_video->seekToTime(gears, Audio::Timestamp(0, 1800 * _fortressPosition, 600)); _vm->_video->seekToTime(gears, Audio::Timestamp(0, 1800 * _fortressPosition, 600));
} else {
_vm->_video->seekToTime(gears, Audio::Timestamp(0, 1800 * (_fortressPosition % 2), 600));
}
_vm->_sound->playSoundBlocking(_fortressRotationSounds[_fortressPosition]); _vm->_sound->playSoundBlocking(_fortressRotationSounds[_fortressPosition]);
_gearsWereRunning = false; _gearsWereRunning = false;
@ -848,6 +872,22 @@ void Mechanical::o_fortressRotation_init(uint16 op, uint16 var, uint16 argc, uin
_fortressRotationBrake = 0; _fortressRotationBrake = 0;
// WORKAROUND for the tower rotation bug in Myst ME.
// The original engine only allowed to visit two out of the three small islands,
// preventing the game from being fully completable.
// The fortress rotation is computed from the current position in the movie
// hcgears.mov. The version of this movie that shipped with the ME edition is
// too short to allow to visit all the islands.
// ScummVM simulates a longer movie by counting the number of times the movie
// looped and adding that time to the current movie position.
// Hence allowing the fortress position to be properly computed.
uint32 movieDuration = _vm->_video->getDuration(gears).convertToFramerate(600).totalNumberOfFrames();
if (movieDuration == 3680) {
_fortressRotationShortMovieWorkaround = true;
_fortressRotationShortMovieCount = 0;
_fortressRotationShortMovieLast = 0;
}
_fortressRotationRunning = true; _fortressRotationRunning = true;
_gearsWereRunning = false; _gearsWereRunning = false;
} }

4
engines/mohawk/myst_stacks/mechanical.h
View file

@ -111,6 +111,10 @@ private:
uint16 _fortressRotationSounds[4]; // 86 to 92 uint16 _fortressRotationSounds[4]; // 86 to 92
MystResourceType6 *_fortressRotationGears; // 172 MystResourceType6 *_fortressRotationGears; // 172
bool _fortressRotationShortMovieWorkaround;
uint32 _fortressRotationShortMovieCount;
uint32 _fortressRotationShortMovieLast;
bool _fortressSimulationRunning; bool _fortressSimulationRunning;
bool _fortressSimulationInit; // 94 bool _fortressSimulationInit; // 94
uint16 _fortressSimulationSpeed; // 96 uint16 _fortressSimulationSpeed; // 96