libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-24 03:24:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: Myst: Fix one Atrus video being off position by one pixel

Browse Source 
Fixes #10114.
This commit is contained in:
Bastien Bouclet 2017-08-12 15:33:17 +02:00
parent 4ca14e2242
commit e62e28732f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/mohawk/myst_stacks/dni.cpp
View File

@ -116,8 +116,9 @@ void Dni::o_handPage(uint16 var, const ArgumentsArray &args) {
void Dni::atrusLeft_run() {
if (_vm->_system->getMillis() > _atrusLeftTime + 63333) {
_video = "atrus2";
_videoPos = Common::Point(215, 77);
VideoEntryPtr atrus = _vm->playMovie(_video, kDniStack);
atrus->moveTo(215, 77);
atrus->moveTo(_videoPos.x, _videoPos.y);
atrus->setBounds(Audio::Timestamp(0, 0, 600), Audio::Timestamp(0, 98000, 600));
_waitForLoop = true;
@ -136,7 +137,7 @@ void Dni::atrusLeft_run() {
void Dni::loopVideo_run() {
if (!_vm->_video->isVideoPlaying()) {
VideoEntryPtr atrus = _vm->playMovie(_video, kDniStack);
atrus->moveTo(215, 77);
atrus->moveTo(_videoPos.x, _videoPos.y);
atrus->setBounds(Audio::Timestamp(0, _loopStart, 600), Audio::Timestamp(0, _loopEnd, 600));
atrus->setLooping(true);
@ -152,16 +153,18 @@ void Dni::atrus_run() {
// Atrus asking for page
if (!_vm->_video->isVideoPlaying()) {
_video = "atr1page";
_videoPos = Common::Point(215, 76);
VideoEntryPtr atrus = _vm->playMovie(_video, kDniStack);
atrus->moveTo(215, 77);
atrus->moveTo(_videoPos.x, _videoPos.y);
atrus->setLooping(true);
atrus->setBounds(Audio::Timestamp(0, 7388, 600), Audio::Timestamp(0, 14700, 600));
}
} else if (_globals.ending != 3 && _globals.ending != 4) {
if (_globals.heldPage == 13) {
_video = "atr1page";
_videoPos = Common::Point(215, 76);
VideoEntryPtr atrus = _vm->playMovie(_video, kDniStack);
atrus->moveTo(215, 77);
atrus->moveTo(_videoPos.x, _videoPos.y);
atrus->setBounds(Audio::Timestamp(0, 0, 600), Audio::Timestamp(0, 14700, 600));
_waitForLoop = true;
@ -173,8 +176,9 @@ void Dni::atrus_run() {
} else {
_video = "atr1nopg";
_videoPos = Common::Point(215, 77);
VideoEntryPtr atrus = _vm->playMovie(_video, kDniStack);
atrus->moveTo(215, 77);
atrus->moveTo(_videoPos.x, _videoPos.y);
atrus->setBounds(Audio::Timestamp(0, 0, 600), Audio::Timestamp(0, 46175, 600));
_waitForLoop = true;

3
engines/mohawk/myst_stacks/dni.h
View File

@ -58,7 +58,10 @@ private:
bool _atrusRunning;
bool _notSeenAtrus; // 56
uint32 _atrusLeftTime; // 60
Common::String _video; // 64
Common::Point _videoPos;
bool _waitForLoop;
uint32 _loopStart; // 72
uint32 _loopEnd; // 76