diff options
| author | Paul Gilbert | 2014-11-01 16:07:52 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:19:25 -0500 |
| commit | ae24bf54b43ab682f4e057c117810c1506b58d4d (patch) | |
| tree | 759f37807b8de3ff09e3f34f0b9a2f3e60256262 /engines | |
| parent | 21c1d0f920a530b310a68376e9aa8836ed43471b (diff) | |
| download | scummvm-rg350-ae24bf54b43ab682f4e057c117810c1506b58d4d.tar.gz scummvm-rg350-ae24bf54b43ab682f4e057c117810c1506b58d4d.tar.bz2 scummvm-rg350-ae24bf54b43ab682f4e057c117810c1506b58d4d.zip | |
ACCESS: Fixes for startChapter
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/access/access.cpp | 4 | ||||
| -rw-r--r-- | engines/access/access.h | 2 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_game.cpp | 7 | ||||
| -rw-r--r-- | engines/access/amazon/amazon_resources.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 9b49b9f55c..fab66c3b6c 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -432,8 +432,8 @@ void AccessEngine::copyBF2Vid() { } } -void AccessEngine::playVideo(int fileNum, const Common::Point &pt) { - _video->setVideo(_screen, pt, FileIdent(fileNum, 96), 10); +void AccessEngine::playVideo(int videoNum, const Common::Point &pt) { + _video->setVideo(_screen, pt, FileIdent(96, videoNum), 10); while (!shouldQuit() && !_video->_videoEnd) { _video->playVideo(); diff --git a/engines/access/access.h b/engines/access/access.h index a12a63212d..fcac69d56e 100644 --- a/engines/access/access.h +++ b/engines/access/access.h @@ -122,7 +122,7 @@ protected: /** * Play back an entire video */ - void playVideo(int fileNum, const Common::Point &pt); + void playVideo(int videoNum, const Common::Point &pt); // Engine APIs virtual Common::Error run(); diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 3af07edaf3..8270eaee6b 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -444,10 +444,10 @@ void AmazonEngine::startChapter(int chapter) { const int *chapImg = &CHAPTER_TABLE[_chapter - 1][0]; _screen->plotImage(_objectsTable[0], _chapter - 1, Common::Point(chapImg[1], chapImg[2])); - _screen->plotImage(_objectsTable[_chapter - 1], 0, + _screen->plotImage(_objectsTable[_chapter], 0, Common::Point(chapImg[3], chapImg[4])); if (chapter == 14) - _screen->plotImage(_objectsTable[_chapter - 1], 1, Common::Point(169, 76)); + _screen->plotImage(_objectsTable[_chapter], 1, Common::Point(169, 76)); _sound->newMusic(chapImg[4], 1); _sound->newMusic(33, 0); @@ -485,12 +485,13 @@ void AmazonEngine::startChapter(int chapter) { _fonts._charSet._hi = 10; _fonts._charFor._lo = 55; _fonts._charFor._hi = 0xFF; + _screen->_maxChars = 43; _screen->_printOrg = Common::Point(31, 77); _screen->_printStart = Common::Point(31, 77); _establishGroup = 1; loadEstablish(0x40 + _chapter); - uint16 msgOffset = READ_LE_UINT16(_eseg->data() + (_chapter * 2) + 2); + uint16 msgOffset = READ_LE_UINT16(_eseg->data() + ((0x40 + _chapter) * 2) + 2); _printEnd = 170; _printEnd = 155; diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 05af0c116b..0807a979cc 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -48,7 +48,7 @@ const char *const FILENAMES[] = { "NARATE01.AP", "NARATE02.AP", "NARATE03.AP", "NARATE04.AP", "NARATE05.AP", "NARATE06.AP", "NARATE07.AP", "NARATE08.AP", "NARATE09.AP", "NARATE10.AP", "NARATE11.AP", "NARATE12.AP", - "NARATE13.AP", "NARATE14.AP" + "NARATE13.AP", "NARATE14.AP", "S00.AP", "TAG.AP" }; const byte MOUSE0[] = { |