From 93697c170465df759fb6d26998863ecf2f50301f Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Fri, 27 Nov 2015 00:48:11 +0100 Subject: MADS: Silence Clang warning There are others still left, but this one was obvious how to fix. --- engines/mads/phantom/phantom_scenes1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 61d32d3f25..7bc9c179b9 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -59,7 +59,7 @@ void Scene1xx::sceneEntrySound() { break; case 103: - if ((_globals[kJacquesStatus] == 2)) { + if (_globals[kJacquesStatus] == 2) { _vm->_sound->command(32); _globals[kJacquesStatus] = 3; } else -- cgit v1.2.3 From 279be647daa1f96a5efc443ef1aa4441d03a6b3a Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 27 Nov 2015 01:44:32 +0100 Subject: ACCESS: Fix bug in River --- engines/access/amazon/amazon_resources.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 430aa64f30..3d18a16502 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -2349,8 +2349,8 @@ RiverStruct RIVER2OBJECTS[54] = { RiverStruct *RIVER_OBJECTS[3][2] = { { RIVER0OBJECTS, RIVER0OBJECTS + 46 - 1}, - { RIVER1OBJECTS, RIVER0OBJECTS + 50 - 1 }, - { RIVER2OBJECTS, RIVER0OBJECTS + 54 - 1 } + { RIVER1OBJECTS, RIVER1OBJECTS + 50 - 1 }, + { RIVER2OBJECTS, RIVER2OBJECTS + 54 - 1 } }; const int HELP1COORDS[2][4] = { -- cgit v1.2.3 From fe916f17941ecb383d9f19c7fc046af3816cd73f Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 27 Nov 2015 02:05:40 +0100 Subject: ACCESS: Martian - Simplify check in takePicture() --- engines/access/room.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/access/room.cpp b/engines/access/room.cpp index c91b37c65d..d0f1e59569 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -111,8 +111,7 @@ void Room::takePicture() { return; } - // TODO: simplify the second part of the test when tested - if ((_vm->_scrollCol < 35) || ((_vm->_scrollRow >= 10) && (_vm->_scrollRow >= 20))){ + if ((_vm->_scrollCol < 35) || (_vm->_scrollRow >= 20)){ Common::String msg = "THAT ISN'T INTERESTING ENOUGH TO WASTE FILM ON."; _vm->_scripts->doCmdPrint_v1(msg); return; -- cgit v1.2.3 From 9d6ae42f655bd1c3797f949763c73ecf8cbf6b53 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 27 Nov 2015 15:05:41 +0100 Subject: MORTEVIELLE: Reduce the scope of a variable --- engines/mortevielle/utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index cbc22e4886..651bd5bf57 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -1728,12 +1728,12 @@ void MortevielleEngine::showMoveMenuAlert() { void MortevielleEngine::showConfigScreen() { // FIXME: need a DOS palette, index 9 (light blue). Also we should show DOS font here Common::String tmpStr; - int width, cy = 0; + int cy = 0; clearScreen(); do { ++cy; tmpStr = getString(cy + kStartingScreenStringIndex); - width = _screenSurface->getStringWidth(tmpStr); + int width = _screenSurface->getStringWidth(tmpStr); _text->displayStr(tmpStr, 320 - width / 2, cy * 8, 80, 1, 2); } while (cy != 20); -- cgit v1.2.3 From 751183a2698398f8b25f85d189d91151be90549c Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 27 Nov 2015 15:06:10 +0100 Subject: CGE2: Silent a CppCheck warning --- engines/cge2/sound.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h index 6673b67b7a..02afe610a2 100644 --- a/engines/cge2/sound.h +++ b/engines/cge2/sound.h @@ -68,7 +68,7 @@ class Sound { public: SmpInfo _smpinf; - Sound(CGE2Engine *vm); + explicit Sound(CGE2Engine *vm); ~Sound(); void open(); void close(); @@ -116,7 +116,7 @@ private: // Stop MIDI File void sndMidiStop(); public: - MusicPlayer(CGE2Engine *vm); + explicit MusicPlayer(CGE2Engine *vm); ~MusicPlayer(); void loadMidi(int ref); -- cgit v1.2.3 From 24dbee0f065b7165b6c18d73b9b6c564b181640b Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 16:37:49 +0100 Subject: FULLPIPE: Check result on realloc() --- engines/fullpipe/statics.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index de3e1ea728..8ee3b14d0c 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -106,9 +106,14 @@ bool StepArray::gotoNextPoint() { } void StepArray::insertPoints(Common::Point **points, int pointsCount) { - if (_currPointIndex + pointsCount >= _pointsCount) + if (_currPointIndex + pointsCount >= _pointsCount) { _points = (Common::Point **)realloc(_points, sizeof(Common::Point *) * (_currPointIndex + pointsCount)); + if (!_points) { + error("Out of memory at StepArray::insertPoints()"); + } + } + _maxPointIndex = _currPointIndex + pointsCount; for (int i = 0; i < pointsCount; i++) { -- cgit v1.2.3 From a6150f9308f24f55793b8be07f8756d39763b59b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 27 Nov 2015 12:12:32 -0500 Subject: ACCESS: Creation of access.dat for holding Access games engine data --- engines/access/access.cpp | 13 + engines/access/access.h | 2 + engines/access/amazon/amazon_game.cpp | 36 +- engines/access/amazon/amazon_logic.cpp | 2 +- engines/access/amazon/amazon_resources.cpp | 2021 +------------------------- engines/access/amazon/amazon_resources.h | 62 +- engines/access/amazon/amazon_room.cpp | 5 +- engines/access/amazon/amazon_scripts.cpp | 4 +- engines/access/char.cpp | 25 +- engines/access/debugger.cpp | 30 +- engines/access/debugger.h | 2 - engines/access/events.cpp | 2 +- engines/access/files.cpp | 18 +- engines/access/files.h | 1 - engines/access/inventory.cpp | 33 +- engines/access/martian/martian_game.cpp | 22 +- engines/access/martian/martian_resources.cpp | 715 +-------- engines/access/martian/martian_resources.h | 29 +- engines/access/martian/martian_room.cpp | 2 +- engines/access/resources.cpp | 134 ++ engines/access/resources.h | 64 + engines/access/room.cpp | 13 +- engines/access/scripts.cpp | 11 +- engines/access/sound.cpp | 2 +- 24 files changed, 377 insertions(+), 2871 deletions(-) (limited to 'engines') diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 56fa6c7533..bc9bcb4b08 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -34,19 +34,24 @@ namespace Access { AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc) : _gameDescription(gameDesc), Engine(syst), _randomSource("Access"), _useItem(_flags[99]), _startup(_flags[170]), _manScaleOff(_flags[172]) { + _aboutBox = nullptr; _animation = nullptr; _bubbleBox = nullptr; _char = nullptr; _debugger = nullptr; _events = nullptr; _files = nullptr; + _invBox = nullptr; _inventory = nullptr; + _helpBox = nullptr; _midi = nullptr; _player = nullptr; + _res = nullptr; _room = nullptr; _screen = nullptr; _scripts = nullptr; _sound = nullptr; + _travelBox = nullptr; _video = nullptr; _destIn = nullptr; @@ -130,6 +135,7 @@ AccessEngine::~AccessEngine() { delete _inventory; delete _midi; delete _player; + delete _res; delete _room; delete _screen; delete _scripts; @@ -204,6 +210,13 @@ void AccessEngine::initialize() { } Common::Error AccessEngine::run() { + _res = Resources::init(this); + Common::String errorMessage; + if (!_res->load(errorMessage)) { + GUIErrorMessage(errorMessage); + return Common::kNoError; + } + setVGA(); initialize(); diff --git a/engines/access/access.h b/engines/access/access.h index 83e313083b..2ca4a3468e 100644 --- a/engines/access/access.h +++ b/engines/access/access.h @@ -42,6 +42,7 @@ #include "access/font.h" #include "access/inventory.h" #include "access/player.h" +#include "access/resources.h" #include "access/room.h" #include "access/screen.h" #include "access/scripts.h" @@ -147,6 +148,7 @@ public: FileManager *_files; InventoryManager *_inventory; Player *_player; + Resources *_res; Room *_room; Screen *_screen; Scripts *_scripts; diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index 7a55873d97..cf90beae96 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -146,27 +146,24 @@ void AmazonEngine::playGame() { } void AmazonEngine::setupGame() { + Amazon::AmazonResources &res = *((Amazon::AmazonResources *)_res); + // Load death list - if (isDemo()) { - _deaths.resize(34); - for (int i = 0; i < 34; ++i) { - _deaths[i]._screenId = DEATH_SCREENS_DEMO[i]; - _deaths[i]._msg = DEATH_TEXT_DEMO[i]; - } - } else { - _deaths.resize(58); - for (int i = 0; i < 58; ++i) { - _deaths[i]._screenId = DEATH_SCREENS[i]; - _deaths[i]._msg = DEATH_TEXT[i]; - } + _deaths.resize(_res->DEATHS.size()); + + for (uint idx = 0; idx < _deaths.size(); ++idx) { + _deaths[idx]._screenId = res.DEATHS[idx]._screenId; + _deaths[idx]._msg = res.DEATHS[idx]._msg; } + + // Load the deaths cells _deaths._cells.resize(13); for (int i = 0; i < 13; ++i) _deaths._cells[i] = CellIdent(DEATH_CELLS[i][0], DEATH_CELLS[i][1], DEATH_CELLS[i][2]); // Miscellaneous - _fonts._font1.load(FONT6x6_INDEX, FONT6x6_DATA); - _fonts._font2.load(FONT2_INDEX, FONT2_DATA); + _fonts._font1.load(&res.FONT6x6_INDEX[0], &res.FONT6x6_DATA[0]); + _fonts._font2.load(&res.FONT2_INDEX[0], &res.FONT2_DATA[0]); initVariables(); } @@ -195,8 +192,8 @@ void AmazonEngine::initVariables() { _timers.push_back(te); } - _player->_playerX = _player->_rawPlayer.x = _travelPos[_player->_roomNumber][0]; - _player->_playerY = _player->_rawPlayer.y = _travelPos[_player->_roomNumber][1]; + _player->_playerX = _player->_rawPlayer.x = _res->ROOMTBL[_player->_roomNumber]._travelPos.x; + _player->_playerY = _player->_rawPlayer.y = _res->ROOMTBL[_player->_roomNumber]._travelPos.y; _room->_selectCommand = -1; _events->setNormalCursor(CURSOR_CROSSHAIRS); _mouseMode = 0; @@ -411,6 +408,7 @@ void AmazonEngine::calcIQ() { } void AmazonEngine::helpTitle() { + AmazonResources &res = *(AmazonResources *)_res; int width = _fonts._font2.stringWidth(_bubbleBox->_bubbleTitle); int posX = 160 - (width / 2); _fonts._font2._fontColors[0] = 0; @@ -419,13 +417,13 @@ void AmazonEngine::helpTitle() { _fonts._font2._fontColors[3] = 35; _fonts._font2.drawString(_screen, _bubbleBox->_bubbleTitle, Common::Point(posX, 24)); - width = _fonts._font2.stringWidth(HELPLVLTXT[_helpLevel]); + width = _fonts._font2.stringWidth(res.HELPLVLTXT[_helpLevel]); posX = 160 - (width / 2); _fonts._font2._fontColors[0] = 0; _fonts._font2._fontColors[1] = 10; _fonts._font2._fontColors[2] = 11; _fonts._font2._fontColors[3] = 12; - _fonts._font2.drawString(_screen, HELPLVLTXT[_helpLevel], Common::Point(posX, 36)); + _fonts._font2.drawString(_screen, res.HELPLVLTXT[_helpLevel], Common::Point(posX, 36)); Common::String iqText = "IQ: "; calcIQ(); @@ -441,7 +439,7 @@ void AmazonEngine::helpTitle() { index /= 20; iqText += " "; - iqText += IQLABELS[index]; + iqText += res.IQLABELS[index]; width = _fonts._font2.stringWidth(iqText); posX = 160 - (width / 2); diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp index de53da51cd..f927525ad1 100644 --- a/engines/access/amazon/amazon_logic.cpp +++ b/engines/access/amazon/amazon_logic.cpp @@ -1598,7 +1598,7 @@ void River::moveCanoe() { if (events._leftButton && pt.y >= 140) { if (pt.x < _vm->_room->_rMouse[8][0]) { // Disk icon wasn't clicked - _vm->_scripts->printString(BAR_MESSAGE); + _vm->_scripts->printString(AMRES.BAR_MESSAGE); } else { // Clicked on the Disc icon. Show the ScummVM menu _vm->_room->handleCommand(9); diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 3d18a16502..2be1c0f8ba 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -27,50 +27,63 @@ namespace Access { namespace Amazon { -const char *const FILENAMES[] = { - "S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP", - "S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP", - "S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP", - "S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP", - "S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP", - "S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP", - "S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "C26.AP", - "S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP", - "C36.AP", nullptr, "S50.AP", nullptr, nullptr, "S53.AP", - "S54.AP", "S55.AP", "C35.AP", "S57.AP", "S58.AP", nullptr, - nullptr, "S61.AP", nullptr, nullptr, "S64.AP", "C00.AP", - "C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP", - "C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP", - "C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP", - "C24.AP", "C25.AP", "C29.AP", "C30.AP", "C32.AP", "C33.AP", - "C34.AP", "CREDITS.AP", "MIDIDRV.AP", "SUMMARY.AP", "DEAD.AP", - "EST.AP", "CHAPTER.AP", "MIDI.AP", "SOUND.AP", "INV.AP", - // The following files are only present in the CD version - "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", "S00.AP", "TAG.AP" -}; - -const char *const FILENAMES_DEMO[] = { - "S00.AP", "S01.AP", "S02.AP", "R03.AP", "S04.AP", "S05.AP", - "S06.AP", "S07.AP", "S08.AP", "S09.AP", "S10.AP", "S11.AP", - "S12.AP", "S13.AP", "S14.AP", "S15.AP", "S16.AP", "S17.AP", - "S18.AP", "S19.AP", "S20.AP", "S21.AP", "S22.AP", "S23.AP", - "S24.AP", "S25.AP", "S26.AP", "S27.AP", "S28.AP", "S29.AP", - "S30.AP", "S31.AP", "S32.AP", "S33.AP", "S34.AP", "R35.AP", - "S36.AP", "S37.AP", "S38.AP", "S39.AP", "S40.AP", "TITLE.AP", - "S42.AP", "S01.AP", "S44.AP", "S45.AP", "S46.AP", "S47.AP", - nullptr, nullptr, "S50.AP", nullptr, nullptr, "S53.AP", - "S54.AP", nullptr, nullptr, "S57.AP", nullptr, nullptr, - nullptr, "S61.AP", nullptr, "C23.AP", "C12.AP", "C00.AP", - "C01.AP", "C06.AP", "C07.AP", "C08.AP", "C05.AP", "C09.AP", - "C12.AP", "C03.AP", "C13.AP", "C15.AP", "C14.AP", "C16.AP", - "C17.AP", "C19.AP", "C20.AP", "C21.AP", "C22.AP", "C23.AP", - "C24.AP", "C25.AP", "R49.AP", "R49.AP", "R49.AP", "R49.AP", - "R49.AP", "R49.AP", "R49.AP", "R49.AP", "DEAD.AP", "EST.AP", - "CHAPTER.AP", "MUSIC.AP", "SOUND.AP", "INV.AP" -}; +AmazonResources::AmazonResources(AccessEngine *vm): Resources(vm) { +} + +void AmazonResources::load(Common::SeekableReadStream &s) { + Resources::load(s); + uint count; + + // Load the version specific data + NO_HELP_MESSAGE = readString(s); + NO_HINTS_MESSAGE = readString(s); + RIVER_HIT1 = readString(s); + RIVER_HIT2 = readString(s); + BAR_MESSAGE = readString(s); + + for (int idx = 0; idx < 3; ++idx) + HELPLVLTXT[idx] = readString(s); + for (int idx = 0; idx < 9; ++idx) + IQLABELS[idx] = readString(s); + + CANT_GET_THERE = readString(s); + + // Get the offset of the general shared data for the game + uint entryOffset = findEntry(_vm->getGameID(), 2, 0, (Common::Language)0); + s.seek(entryOffset); + + // Read in the cursor list + count = s.readUint16LE(); + CURSORS.resize(count); + for (uint idx = 0; idx < count; ++idx) { + uint count2 = s.readUint16LE(); + CURSORS[idx].resize(count2); + s.read(&CURSORS[idx][0], count2); + } + + // Load font data + count = s.readUint16LE(); + FONT2_INDEX.resize(count); + for (uint idx = 0; idx < count; ++idx) + FONT2_INDEX[idx] = s.readSint16LE(); + + count = s.readUint16LE(); + FONT2_DATA.resize(count); + for (uint idx = 0; idx < count; ++idx) + FONT2_DATA[idx] = s.readByte(); + + count = s.readUint16LE(); + FONT6x6_INDEX.resize(count); + for (uint idx = 0; idx < count; ++idx) + FONT6x6_INDEX[idx] = s.readSint16LE(); + + count = s.readUint16LE(); + FONT6x6_DATA.resize(count); + for (uint idx = 0; idx < count; ++idx) + FONT6x6_DATA[idx] = s.readByte(); +} + +/*------------------------------------------------------------------------*/ const int SIDEOFFR[] = { 5, 5, 5, 5, 5, 5, 5, 5, 0 }; const int SIDEOFFL[] = { 5, 5, 5, 5, 5, 5, 5, 5, 0 }; @@ -85,316 +98,6 @@ const int DIAGOFFULY[] = { 3, 3, 1, 2, 2, 1, 1, 1, 0 }; const int DIAGOFFDLX[] = { 4, 5, 3, 3, 5, 4, 6, 1, 0 }; const int DIAGOFFDLY[] = { 2, 2, 1, 2, 3, 1, 2, 1, 0 }; -const byte MOUSE0[] = { - // hotspot x and y, uint16 LE - 0, 0, 0, 0, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0, 2, 6, 1, - 0, 3, 6, 6, 1, - 0, 3, 6, 6, 1, - 0, 4, 6, 6, 6, 1, - 0, 4, 6, 6, 6, 1, - 0, 5, 6, 6, 6, 6, 1, - 0, 5, 6, 6, 6, 6, 1, - 0, 6, 6, 6, 6, 6, 6, 1, - 0, 6, 6, 6, 6, 6, 6, 1, - 0, 7, 6, 6, 6, 6, 6, 6, 1, - 0, 6, 6, 6, 6, 6, 6, 1, - 0, 5, 6, 6, 6, 6, 1, - 2, 3, 6, 6, 1, - 3, 3, 6, 6, 1, - 3, 3, 6, 6, 1, - 4, 2, 6, 1 -}; - -const byte MOUSE1[] = { - // hotspot x and y, uint16 LE - 0x07, 0x00, 0x07, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x06, 0x01, 0x05, - 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, - 0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF, - 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x00, 0x0D, 0x05, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x00, 0x05, - 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x01, 0x0B, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x02, 0x09, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xFF, - 0x03, 0x07, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x04, 0x05, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, - 0x06, 0x01, 0x05, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00 -}; - -const byte MOUSE2[] = { - // hotspot x and y, uint16 LE - 0x08, 0x00, 0x08, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x00, 0x00, - 0x00, 0x00, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x02, 0x0C, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x07, 0x02, 0x04, 0x05, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00 -}; - -const byte MOUSE3[] = { - // hotspot x and y, uint16 LE - 0x00, 0x00, 0x00, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x00, 0x0B, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x05, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x00, 0x0C, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, - 0x01, 0x0B, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00 -}; -const byte CURSEYE[] = { - // hotspot x and y, uint16 LE - 0x01, 0x00, 0x08, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x04, 0x06, 0x0E, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, - 0x03, 0x09, 0x0E, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0D, 0x0D, - 0x02, 0x0B, 0x0E, 0x01, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x01, 0x01, 0x0D, - 0x01, 0x0D, 0x0E, 0x01, 0x04, 0x34, 0x01, 0x01, 0x01, 0x07, 0x33, 0x04, 0x04, 0x01, 0x0D, - 0x00, 0x0F, 0x0E, 0x0E, 0x01, 0x07, 0x33, 0x33, 0x01, 0x01, 0x33, 0x34, 0x07, 0x07, 0x06, 0x01, 0x0E, - 0x01, 0x0D, 0x0F, 0x0F, 0x06, 0x07, 0x34, 0x33, 0x33, 0x34, 0x07, 0x07, 0x06, 0x0F, 0x0E, - 0x03, 0x09, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, - 0x01, 0x01, 0x07, - 0x00, 0x03, 0x07, 0x01, 0x07, - 0x01, 0x01, 0x07, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00 -}; - -const byte CURSHAND[] = { - // hotspot x and y, uint16 LE - 0x02, 0x00, 0x03, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x07, 0x02, 0x17, 0x0E, - 0x05, 0x07, 0x0E, 0x12, 0x17, 0x0E, 0x13, 0x17, 0x0E, - 0x02, 0x0C, 0x07, 0x00, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x00, 0x17, - 0x01, 0x0E, 0x07, 0x01, 0x07, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x11, 0x0F, 0x0E, 0x12, 0x17, 0x0E, - 0x02, 0x0D, 0x07, 0x00, 0x17, 0x0F, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0E, - 0x04, 0x0B, 0x0F, 0x0E, 0x11, 0x17, 0x0E, 0x12, 0x0F, 0x0F, 0x11, 0x17, 0x0E, - 0x04, 0x0B, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x12, 0x17, 0x0E, 0x11, 0x0F, 0x0E, - 0x00, 0x0F, 0x0E, 0x0D, 0x12, 0x00, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x12, 0x0F, 0x0E, 0x12, 0x17, 0x0F, - 0x00, 0x0F, 0x0F, 0x17, 0x0D, 0x11, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, - 0x01, 0x0E, 0x0F, 0x17, 0x0F, 0x0E, 0x0F, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, - 0x02, 0x0D, 0x0F, 0x17, 0x0F, 0x0E, 0x0D, 0x0D, 0x0F, 0x0F, 0x0E, 0x0F, 0x0E, 0x0E, 0x12, - 0x03, 0x0C, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, - 0x04, 0x0A, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0E, 0x0F, 0x0F, 0x0E, 0x0D, - 0x05, 0x09, 0x0F, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, - 0x06, 0x08, 0x17, 0x0F, 0x0F, 0x0F, 0x0F, 0x0E, 0x0D, 0x12, - 0x06, 0x07, 0x17, 0x0F, 0x0F, 0x0F, 0x3D, 0x0E, 0x0D -}; - -const byte CURSGET[] = { - // hotspot x and y, uint16 LE - 0x07, 0x00, 0x0E, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x0A, 0x05, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, - 0x08, 0x08, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x06, 0x0A, 0x1C, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x05, 0x0A, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x03, 0x0C, 0x07, 0x1C, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x02, 0x0D, 0x1C, 0x0F, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x01, 0x0E, 0x07, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x00, 0x0F, 0x1C, 0x0F, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0C, - 0x00, 0x0F, 0x1C, 0x0E, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x0C, 0x0E, 0x0F, 0x0F, 0x0F, 0x0C, - 0x00, 0x0E, 0x1C, 0x0D, 0x0F, 0x0E, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x0F, 0x0F, 0x0C, - 0x00, 0x0E, 0x1C, 0x0E, 0x0F, 0x0D, 0x0F, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0F, 0x0C, - 0x00, 0x0D, 0x1C, 0x0D, 0x0F, 0x0D, 0x0F, 0x0C, 0x00, 0x00, 0x00, 0x0E, 0x1C, 0x0F, 0x0C, - 0x01, 0x0B, 0x0E, 0x0F, 0x0E, 0x0F, 0x0C, 0x00, 0x00, 0x0E, 0x07, 0x0F, 0x0C, - 0x02, 0x09, 0x0E, 0x0D, 0x0F, 0x0C, 0x00, 0x07, 0x0E, 0x0F, 0x0C, - 0x03, 0x06, 0x0E, 0x0F, 0x0E, 0x07, 0x01, 0x07, - 0x07, 0x01, 0x07 -}; - -const byte CURSCLIMB[] = { - // hotspot x and y, uint16 LE - 0x03, 0x00, 0x0E, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x06, 0x04, 0x01, 0x01, 0x01, 0x01, - 0x06, 0x04, 0x0F, 0x0E, 0x01, 0x01, - 0x06, 0x04, 0x0F, 0x0E, 0x0D, 0x01, - 0x07, 0x02, 0x0F, 0x0D, - 0x00, 0x0C, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x13, 0x12, 0x12, 0x12, 0x12, 0x11, 0x11, - 0x00, 0x0D, 0x0D, 0x0E, 0x00, 0x00, 0x13, 0x14, 0x13, 0x12, 0x12, 0x12, 0x11, 0x11, 0x0E, - 0x01, 0x0C, 0x0D, 0x0D, 0x0D, 0x0E, 0x11, 0x13, 0x13, 0x12, 0x11, 0x11, 0x0E, 0x0D, - 0x02, 0x0C, 0x0E, 0x0E, 0x00, 0x00, 0x00, 0x13, 0x12, 0x11, 0x00, 0x00, 0x0E, 0x0D, - 0x03, 0x0B, 0x04, 0x04, 0x04, 0x22, 0x21, 0x21, 0x20, 0x00, 0x00, 0x00, 0x0D, - 0x02, 0x0D, 0x22, 0x04, 0x20, 0x22, 0x04, 0x21, 0x04, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x0E, - 0x03, 0x07, 0x22, 0x21, 0x20, 0x20, 0x22, 0x04, 0x20, - 0x04, 0x06, 0x01, 0x01, 0x00, 0x04, 0x22, 0x20, - 0x02, 0x09, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x04, 0x20, - 0x03, 0x09, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x22, 0x04, 0x20, - 0x02, 0x0B, 0x07, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x20, - 0x03, 0x0A, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01 -}; - -const byte CURSTALK[] = { - // hotspot x and y, uint16 LE - 0x02, 0x00, 0x0B, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x03, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x01, 0x0C, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, - 0x00, 0x0E, 0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x07, 0x06, 0x07, 0x06, - 0x00, 0x0F, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, - 0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x08, 0x06, 0x06, - 0x00, 0x0F, 0x06, 0x06, 0x08, 0x06, 0x08, 0x08, 0x08, 0x06, 0x08, 0x06, 0x06, 0x08, 0x06, 0x08, 0x06, - 0x01, 0x0E, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, - 0x02, 0x0C, 0x06, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, 0x06, 0x07, 0x06, 0x07, 0x06, - 0x04, 0x09, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x06, 0x06, - 0x07, 0x04, 0x06, 0x07, 0x07, 0x06, - 0x02, 0x08, 0x07, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x01, 0x06, 0x07, 0x01, 0x07, 0x06, 0x06, 0x06, - 0x02, 0x01, 0x07, - 0x00, 0x00, - 0x00, 0x00, - 0x00, 0x00 -}; -const byte CURSHELP[] = { - // hotspot x and y, uint16 LE - 0x02, 0x00, 0x0B, 0x00, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0x04, 0x06, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, - 0x02, 0x0A, 0x24, 0x24, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, - 0x01, 0x0C, 0x24, 0x22, 0x22, 0x22, 0x20, 0x20, 0x20, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20, - 0x00, 0x0E, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x20, - 0x01, 0x0D, 0x24, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x07, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x05, 0x07, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, 0x20, - 0x04, 0x05, 0x24, 0x22, 0x22, 0x22, 0x20, - 0x02, 0x07, 0x07, 0x00, 0x24, 0x20, 0x20, 0x20, 0x20, - 0x01, 0x03, 0x07, 0x01, 0x07, - 0x02, 0x07, 0x07, 0x00, 0x00, 0x24, 0x24, 0x24, 0x24, - 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x04, 0x06, 0x24, 0x22, 0x22, 0x22, 0x22, 0x20, - 0x05, 0x04, 0x20, 0x20, 0x20, 0x20 -}; -const byte *const CURSORS[10] = { - MOUSE0, MOUSE1, MOUSE2, MOUSE3, CURSEYE, CURSHAND, CURSGET, CURSCLIMB, CURSTALK, CURSHELP -}; - -const int _travelPos[][2] = { - { -1, 0 }, - { 228, 117 }, - { 28, 98 }, - { 161, 140 }, - { 130, 139 }, - { 884, 95 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 41, 185 }, - { 60, 138 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 170, 155 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 108, 95 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 100, 115 }, - { 480, 90 }, - { 154, 63 }, - { 0, 0 }, - { 145, 85 }, - { 0, 0 }, - { 110, 107 }, - { 0, 0 }, - { 105, 154 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 20, 160 }, - { 130, 314 }, - { 0, 0 }, - { 50, 125 }, - { 0, 0 }, - { 0, 0 }, - { 123, 123 }, - { -1, 7 }, - { 266, 168 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { -1, 18 }, - { -1, 19 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 203, 160 }, - { 0, 0 }, - { 283, 163 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 }, - { 180, 165 }, - { 0, 0 }, - { 0, 0 }, - { 0, 0 } -}; - const int OVEROFFR[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 }; const int OVEROFFL[] = { 2, 2, 1, 2, 2, 1, 0, 0, 0 }; const int OVEROFFU[] = { 1, 1, 1, 1, 1, 1, 0, 0, 0 }; @@ -408,1528 +111,6 @@ const int OVEROFFULY[] = { 1, 0, 0, 2, 1, 0, 0, 0, 0 }; const int OVEROFFDLX[] = { 1, 2, 1, 1, 2, 1, 0, 0, 0 }; const int OVEROFFDLY[] = { 0, 1, 0, 0, 1, 1, 0, 0, 0 }; -const byte CREDITS[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x3, 0x0, 0x30, 0x22, 0x30, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, - 0x0, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ALLISTER[] = { - 0x0, 0xFF, 0xFF, 0x61, 0x0, 0x0, 0x0, 0x36, 0x0F, 0x5E, 0x4, 0x0, 0x0, - 0x0, 0x4, 0x4, 0x0, 0x3, 0x0, 0xFF, 0x4, 0x0, 0x2, 0x0, 0x4, 0x0, 0x1, 0x0, 0x8C, - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, - 0x1, 0x0, 0x62, 0x0, 0x0B, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0C, 0x0, 0x1, 0x0, 0x62, - 0x0, 0x0D, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte HALL[] = { - 0x0, 0xFF, 0xFF, 0x61, 0x0, 0x0, 0x0, 0x40, 0x3E, 0x1A, 0x5, 0x0, 0x0, - 0x0, 0x5, 0x5, 0x0, 0x3, 0x0, 0xFF, 0x5, 0x0, 0x2, 0x0, 0x5, 0x0, 0x1, 0x0, 0xFF, - 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, 0x62, 0x0, 0x13, 0x0, 0x1, 0x0, - 0x62, 0x0, 0x14, 0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte JASONLAB[] = { - 0x1, 0x6, 0x0, 0x61, 0x0, 0x0D, 0x0, 0x40, 0x20, 0x0C4, 0x6, 0x0, 0x0, 0x0, - 0x6, 0x6, 0x0, 0x3, 0x0, 0xFF, 0x6, 0x0, 0x2, 0x0, 0x6, 0x0, 0x1, 0x0, 0xFF, 0x0, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x1, - 0x0, 0x62, 0x0, 0x1, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x26, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, - 0x62, 0x0, 0x35, 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte ALLENLAB[] = { - 0x1, 0x8, 0x0, 0x61, 0x0, 0x0D, 0x0, 0x40, 0x20, 0x0C4, 0x8, 0x0, 0x0, 0x0, - 0x8, 0x8, 0x0, 0x3, 0x0, 0xFF, 0x8, 0x0, 0x2, 0x0, 0x8, 0x0, 0x1, 0x0, 0xFF, 0x0, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x1, - 0x0, 0x62, 0x0, 0x7, 0x0, 0x1, 0x0, 0x62, 0x0, 0x8, 0x0, 0x2, 0x0, 0x62, 0x0, 0x9, - 0x0, 0x1, 0x0, 0x62, 0x0, 0x0A, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, - 0xFF, 0xFF -}; - -const byte OUTVAULT[] = { - 0x0, 0x9, 0x0, 0x61, 0x0, 0x2B, 0x0, 0x30, 0x18, 0x9B, 0x9, 0x0, 0x0, 0x0, - 0x9, 0x9, 0x0, 0x3, 0x0, 0xFF, 0x9, 0x0, 0x2, 0x0, 0x9, 0x0, 0x1, 0x0, 0x0B4, 0x10, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x3, - 0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x5, 0x0, 0x2, 0x0, 0x62, 0x0, 0x6, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x36, 0x0, 0x1, 0x0, 0x62, 0x0, 0x47, 0x0, 0x1, 0x0, - 0xFF, 0xFF -}; - -const byte VAULT[] = { - 0x0, 0xFF, 0xFF, 0x61, 0x0, 0x29, 0x0, 0x40, 0x3A, 0x37, 0x0A, 0x0, - 0x0, 0x0, 0x0A, 0x0A, 0x0, 0x3, 0x0, 0xFF, 0x0A, 0x0, 0x2, 0x0, 0x0A, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x37, 0x0, 0x2, 0x0, 0x62, 0x0, 0x39, 0x0, - 0x1, 0x0, 0x62, 0x0, 0x38, 0x0, 0x2, 0x0, 0x62, 0x0, 0x15, 0x0, 0x2, 0x0, 0xFF, - 0xFF -}; - -const byte LIBRARY[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x0C, 0x0, 0x40, 0x3A, 0x22, 0x0B, 0x0, - 0x0, 0x0, 0x0B, 0x0B, 0x0, 0x3, 0x0, 0xFF, 0x0B, 0x0, 0x2, 0x0, 0x0B, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x1, 0x0, 0x1, 0x0, 0xFF, 0xFF, -}; - -const byte JASAPT[] = { - 0x1, 0x0C, 0x0, 0x61, 0x0, 0x19, 0x0, 0x40, 0x30, 0x14, 0x0C, 0x0, 0x0, - 0x0, 0x0C, 0x0C, 0x0, 0x3, 0x0, 0xFF, 0x0C, 0x0, 0x2, 0x0, 0x0C, 0x0, 0x1, - 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x18, 0x0, 0x2, 0x0, 0x62, 0x0, 0x17, 0x0, 0x1, 0x0, 0x62, 0x0, 0x11, - 0x0, 0x1, 0x0, 0x62, 0x0, 0x0D, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte RANSACKED[] = { - 0x1, 0x0D, 0x0, 0x61, 0x0, 0x2D, 0x0, 0x40, 0x36, 0x2C, 0x0D, 0x0, 0x0, - 0x0, 0x0D, 0x0D, 0x0, 0x3, 0x0, 0xFF, 0x0D, 0x0, 0x2, 0x0, 0x0D, 0x0, 0x1, - 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x17, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte MEAN1[] = { - 0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3E, 0x33, - 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0x0E, 0x0, 0x5, 0x0, 0x0E, 0x0, 0x4, 0x0, - 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte FLYSOUTH[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x10, 0x0, 0x28, 0x0C, 0x5E, 0x0F, 0x0, - 0x0, 0x0, 0x0F, 0x0F, 0x0, 0x2, 0x0, 0xFF, 0x0F, 0x0, 0x1, 0x0, 0xFF, 0xFF, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte CUZCO[] = { - 0x2, 0x10, 0x0, 0x61, 0x0, 0x10, 0x0, 0x40, 0x20, 0x30, 0x10, 0x0, 0x0, - 0x0, 0x10, 0x10, 0x0, 0x3, 0x0, 0xFF, 0x10, 0x0, 0x2, 0x0, 0x10, 0x0, 0x1, - 0x0, 0x6E, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte INAIR[] = { - 0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x19, 0x2B, - 0x11, 0x0, 0x0, 0x0, 0x11, 0x11, 0x0, 0x3, 0x0, 0xFF, 0x11, 0x0, 0x2, 0x0, - 0x11, 0x0, 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF -}; - -const byte GREENMONKEY[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x11, 0x0, 0x2D, 0x14, 0x3C, 0x12, 0x0, - 0x0, 0x0, 0x12, 0x12, 0x0, 0x3, 0x0, 0xFF, 0x12, 0x0, 0x2, 0x0, 0x12, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte INPLANE[] = { - 0x2, 0x13, 0x0, 0x61, 0x0, 0x26, 0x0, 0x2D, 0x28, 0x28, 0x13, 0x0, 0x0, - 0x0, 0x13, 0x13, 0x0, 0x3, 0x0, 0xFF, 0x13, 0x0, 0x2, 0x0, 0x13, 0x0, 0x1, - 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, - 0x2, 0x0, 0x62, 0x0, 0x29, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, - 0x62, 0x0, 0x38, 0x0, 0x2, 0x0, 0x62, 0x0, 0x33, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte PILFALL[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x16, 0x0, 0x28, 0x0C, 0x5E, 0x14, 0x0, - 0x0, 0x0, 0x14, 0x14, 0x0, 0x2, 0x0, 0xFF, 0x14, 0x0, 0x1, 0x0, 0xFF, 0xFF, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte COCKPIT[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x12, 0x0, 0x3C, 0x2A, 0x29, 0x15, 0x0, - 0x0, 0x0, 0x15, 0x15, 0x0, 0x3, 0x0, 0xFF, 0x15, 0x0, 0x2, 0x0, 0x15, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x23, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte CRASH[] = { - 0x1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x2D, 0x64, - 0x16, 0x0, 0x0, 0x0, 0xFF, 0x16, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0x0, 0x0, - 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x16, 0x0, 0x2, 0x0, 0xFF, - 0xFF, 0x62, 0x0, 0x2A, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte SINKING[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x14, 0x0, 0x40, 0x3C, 0x19, 0x17, 0x0, - 0x0, 0x0, 0x17, 0x17, 0x0, 0x3, 0x0, 0xFF, 0x17, 0x0, 0x2, 0x0, 0x17, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x48, 0x0, 0x1, 0x0, 0x62, 0x0, 0x17, 0x0, - 0x1, 0x0, 0xFF, 0xFF -}; - -const byte JNGLWLK[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x17, 0x0, 0x40, 0x3F, 0x5A, 0x18, 0x0, - 0x0, 0x0, 0x18, 0x18, 0x0, 0x2, 0x0, 0xFF, 0x18, 0x0, 0x1, 0x0, 0xFF, 0xFF, - 0x0, 0x0, 0x0DC, 0x0A0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x62, 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte TOWN[] = { - 0x2, 0x19, 0x0, 0x61, 0x0, 0x18, 0x0, 0x3E, 0x32, 0x80, 0x19, 0x0, 0x0, - 0x0, 0x19, 0x19, 0x0, 0x3, 0x0, 0xFF, 0x19, 0x0, 0x2, 0x0, 0x19, 0x0, 0x1, - 0x0, 0x64, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3D, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3B, 0x0, - 0x2, 0x0, 0xFF, 0xFF -}; - -const byte HOTEL[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x19, 0x0, 0x34, 0x28, 0x28, 0x1A, 0x0, - 0x0, 0x0, 0x1A, 0x1A, 0x0, 0x3, 0x0, 0xFF, 0x1A, 0x0, 0x2, 0x0, 0x1A, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x28, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2B, 0x0, 0x1, 0x0, 0x62, 0x0, 0x46, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x45, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0E, 0x0, 0x1, 0x0, - 0xFF, 0xFF -}; - -const byte CANTINA[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x27, 0x0, 0x40, 0x3A, 0x6C, 0x1B, 0x0, - 0x0, 0x0, 0x1B, 0x1B, 0x0, 0x3, 0x0, 0xFF, 0x1B, 0x0, 0x2, 0x0, 0x1B, 0x0, - 0x1, 0x0, 0x0C8, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte MASSACRE[] = { - 0x2, 0x1D, 0x0, 0x61, 0x0, 0x32, 0x0, 0x20, 0x18, 0x73, 0x1D, 0x0, 0x0, - 0x0, 0x1D, 0x1D, 0x0, 0x3, 0x0, 0xFF, 0x1D, 0x0, 0x2, 0x0, 0x1D, 0x0, 0x1, - 0x0, 0x96, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x0C, 0x0, 0x1, 0x0, 0x62, 0x0, 0x3, 0x0, 0x2, - 0x0, 0x62, 0x0, 0x49, 0x0, 0x2, 0x0, 0x62, 0x0, 0x4A, 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte TRADE[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x18, 0x0, 0x3F, 0x1C, 0x27, 0x1E, 0x0, - 0x0, 0x0, 0x1E, 0x1E, 0x0, 0x3, 0x0, 0xFF, 0x1E, 0x0, 0x2, 0x0, 0x1E, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte BRIDGE[] = { - 0x2, 0x1F, 0x0, 0x61, 0x0, 0x1B, 0x0, 0x40, 0x3F, 0x78, 0x1F, 0x0, 0x0, - 0x0, 0x1F, 0x1F, 0x0, 0x3, 0x0, 0xFF, 0x1F, 0x0, 0x2, 0x0, 0x1F, 0x0, 0x1, - 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte DOCK[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x1E, 0x0, 0x40, 0x3B, 0x4B, 0x20, 0x0, - 0x0, 0x0, 0xFF, 0x20, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0x0, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte DRIVER[] = { - 0x1, 0x21, 0x0, 0x61, 0x0, 0x28, 0x0, 0x30, 0x10, 0x51, 0x21, 0x0, 0x0, - 0x0, 0x21, 0x21, 0x0, 0x2, 0x0, 0xFF, 0x21, 0x0, 0x1, 0x0, 0xFF, 0xFF, - 0x0, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x2E, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte SHORE[] = { - 0x2, 0x24, 0x0, 0x61, 0x0, 0x4, 0x0, 0x3E, 0x3A, 0x32, 0x24, 0x0, 0x0, 0x0, - 0x24, 0x24, 0x0, 0x3, 0x0, 0xFF, 0x24, 0x0, 0x2, 0x0, 0x24, 0x0, 0x1, 0x0, - 0x0B4, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, - 0x2D, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2E, 0x0, - 0x1, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte BOAT[] = { - 0x3, 0xFF, 0xFF, 0x61, 0x0, 0x8, 0x0, 0x3F, 0x3F, 0xFF, 0x25, 0x0, - 0x0, 0x0, 0x25, 0x25, 0x0, 0x3, 0x0, 0xFF, 0x25, 0x0, 0x2, 0x0, 0x25, 0x0, - 0x1, 0x0, 0xFF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x62, 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x21, 0x0, 0x1, 0x0, 0x62, 0x0, 0x25, - 0x0, 0x1, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x30, 0x0, 0x1, 0x0, - 0x62, 0x0, 0x32, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte CABIN[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x8, 0x0, 0x40, 0x32, 0x50, 0x26, 0x0, - 0x0, 0x0, 0x26, 0x26, 0x0, 0x3, 0x0, 0xFF, 0x26, 0x0, 0x2, 0x0, 0x26, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x22, 0x0, 0x2, 0x0, 0x62, 0x0, 0x31, 0x0, - 0x1, 0x0, 0xFF, 0xFF -}; - -const byte CAPTIVE[] = { - 0x2, 0x27, 0x0, 0x61, 0x0, 0x9, 0x0, 0x40, 0x3F, 0x37, 0x27, 0x0, 0x0, 0x0, - 0x27, 0x27, 0x0, 0x3, 0x0, 0xFF, 0x27, 0x0, 0x2, 0x0, 0x27, 0x0, 0x1, 0x0, - 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x0, - 0x0, 0x0, 0x4, 0x0, 0x62, 0x0, 0x1B, 0x0, 0x3, 0x0, 0x62, 0x0, 0x1C, 0x0, 0x1, - 0x0, 0x62, 0x0, 0x1F, 0x0, 0x2, 0x0, 0x62, 0x0, 0x23, 0x0, 0x1, 0x0, 0x62, - 0x0, 0x32, 0x0, 0x1, 0x0, 0x62, 0x0, 0x33, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte VILLAGE[] = { - 0x2, 0x2A, 0x0, 0x61, 0x0, 0x2E, 0x0, 0x1E, 0x1B, 0x6E, 0x2A, 0x0, 0x0, - 0x0, 0x2A, 0x2A, 0x0, 0x3, 0x0, 0xFF, 0x2A, 0x0, 0x2, 0x0, 0x2A, 0x0, 0x1, - 0x0, 0x0A5, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x2D, 0x0, 0x3, 0x0, 0x62, 0x0, 0x3F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x40, - 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte TREE[] = { - 0x2, 0x2C, 0x0, 0x61, 0x0, 0x31, 0x0, 0x1E, 0x1D, 0x0BE, 0x2C, 0x0, 0x0, - 0x0, 0x2C, 0x2C, 0x0, 0x3, 0x0, 0xFF, 0x2C, 0x0, 0x2, 0x0, 0x2C, 0x0, 0x1, - 0x0, 0x50, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x2E, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2F, 0x0, - 0x1, 0x0, 0x62, 0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x42, 0x0, 0x1, 0x0, 0xFF, - 0xFF -}; - -const byte CANOE[] = { - 0x1, 0x2D, 0x0, 0x61, 0x0, 0x2F, 0x0, 0x1E, 0x1D, 0x78, 0x2D, 0x0, 0x0, - 0x0, 0x2D, 0x2D, 0x0, 0x3, 0x0, 0xFF, 0x2D, 0x0, 0x2, 0x0, 0x2D, 0x0, 0x1, - 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x40, 0x0, 0x3, 0x0, 0x62, 0x0, 0x41, 0x0, 0x2, 0x0, 0x62, 0x0, 0x2E, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x2F, 0x0, 0x2, 0x0, 0x62, 0x0, 0x16, 0x0, 0x1, 0x0, - 0xFF, 0xFF -}; - -const byte INTREE[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x33, 0x0, 0x28, 0x1E, 0x32, 0x2E, 0x0, - 0x0, 0x0, 0x2E, 0x2E, 0x0, 0x3, 0x0, 0xFF, 0x2E, 0x0, 0x2, 0x0, 0x2E, 0x0, - 0x1, 0x0, 0x0F0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte FALLS[] = { - 0x1, 0xFF, 0xFF, 0x61, 0x0, 0x3B, 0x0, 0x28, 0x1E, 0x32, 0x2F, 0x0, - 0x0, 0x0, 0x2F, 0x2F, 0x0, 0x3, 0x0, 0xFF, 0x2F, 0x0, 0x2, 0x0, 0x2F, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x4, 0x0, 0x1, 0x0, 0x62, 0x0, 0x2A, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte WATERFALL[] = { - 0x1, 0x36, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x6E, 0x36, - 0x0, 0x0, 0x0, 0x36, 0x36, 0x0, 0x3, 0x0, 0xFF, 0x36, 0x0, 0x2, 0x0, 0x36, - 0x0, 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x36, 0x0, 0x4, - 0x0, 0xFF, 0xFF, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte INWATER[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x36, 0x0, 0x40, 0x3F, 0x2A, 0x37, 0x0, - 0x0, 0x0, 0x37, 0x37, 0x0, 0x3, 0x0, 0xFF, 0x37, 0x0, 0x2, 0x0, 0x37, 0x0, - 0x1, 0x0, 0xFF, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x38, 0x0, 0x1, 0x0, 0xFF, 0xFF -}; - -const byte CAVE[] = { - 0x2, 0x39, 0x0, 0x61, 0x0, 0x37, 0x0, 0x32, 0x14, 0x73, 0x39, 0x0, 0x0, - 0x0, 0x39, 0x39, 0x0, 0x3, 0x0, 0xFF, 0x39, 0x0, 0x2, 0x0, 0x39, 0x0, 0x1, - 0x0, 0x0B4, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x0, 0x0, 0x0, 0x1, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x1, 0x0, 0x62, 0x0, 0x4B, 0x0, - 0x2, 0x0, 0x62, 0x0, 0x4C, 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte PIT[] = { - 0x2, 0xFF, 0xFF, 0x61, 0x0, 0x38, 0x0, 0x41, 0x3F, 0x19, 0x3D, 0x0, - 0x0, 0x0, 0x3D, 0x3D, 0x0, 0x3, 0x0, 0x3E, 0x3D, 0x0, 0x4, 0x0, 0xFF, 0x3D, - 0x0, 0x2, 0x0, 0x3D, 0x0, 0x1, 0x0, 0x0BE, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x62, 0x0, 0x0, 0x0, 0x2, 0x0, 0x62, 0x0, 0x27, 0x0, 0x1, 0x0, - 0x62, 0x0, 0x4D, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0x0 -}; - -const byte *const ROOM_TABLE[] = { - CREDITS, nullptr, nullptr, nullptr, ALLISTER, HALL, JASONLAB, nullptr, - ALLENLAB, OUTVAULT, VAULT, LIBRARY, JASAPT, RANSACKED, MEAN1, FLYSOUTH, - CUZCO, INAIR, GREENMONKEY, INPLANE, PILFALL, COCKPIT, CRASH, SINKING, - JNGLWLK, TOWN, HOTEL, CANTINA, nullptr, MASSACRE, TRADE, BRIDGE, DOCK, - DRIVER, nullptr, nullptr, SHORE, BOAT, CABIN, CAPTIVE, nullptr, - nullptr, VILLAGE, nullptr, TREE, CANOE, INTREE, FALLS, nullptr, - nullptr, nullptr, nullptr, nullptr, nullptr, WATERFALL, INWATER, nullptr, - CAVE, nullptr, nullptr, nullptr, PIT, nullptr, nullptr -}; - -const char *const ROOM_DESCR[] = { - "Credits", nullptr, nullptr, nullptr, "Outside of Allister Center", - "Hall", "Jason's Lab", nullptr, "Allen's Lab", "Outside of the Vault", - "Inside the Vault", "Reader", "Jason's Apartment", "Jason's ransacked apartment", "Cutscene 1", - "TBD FLYSOUTH", "Cuzco Airport", "TBD INAIR", "Green Monkey Club", "In Plane", - "TBD PILFALL", "TBD COCKPIT", "TBD CRASH", "TBD SINKING", "Cutscene Jungle Walk", - "TBD TOWN", "TBD HOTEL", "TBD CANTINA", nullptr, "TBD MASSACRE", - "TBD TRADE", "TBD BRIDGE", "TBD DOCK", "TBD DRIVER", nullptr, - nullptr, "TBD SHORE", "TBD BOAT", "TBD CABIN", "TBD CAPTIVE", - nullptr, nullptr, "TBD VILLAGE", nullptr, "TBD TREE", - "TBD CANOE", "TBD INTREE", "TBD FALLS", nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, "TBD WATERFALL", - "TBD INWATER", nullptr, "Cave Bridge", nullptr, nullptr, - nullptr, "Pit with Ants", nullptr, nullptr -}; - -const byte ROOM_TABLE1_DEMO[] = { - 0x02, 0x61, 0x00, 0x03, 0x00, 0x30, 0x22, 0x30, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, - 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE5_DEMO[] = { - 0x00, 0x61, 0x00, 0x0E, 0x00, 0x36, 0x0F, 0x5E, 0x04, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x00, 0x03, 0x00, 0xFF, 0x04, 0x00, - 0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0x8C, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x0B, 0x00, 0x01, 0x00, 0x62, 0x00, 0x0C, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x0D, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE6_DEMO[] = { - 0x00, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x3E, 0x1A, 0x05, 0x00, - 0x00, 0x00, 0x05, 0x05, 0x00, 0x03, 0x00, 0xFF, 0x05, 0x00, - 0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0xFF, 0x30, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x12, 0x00, 0x03, 0x00, 0x62, 0x00, 0x13, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x14, 0x00, 0x02, 0x00, 0x62, 0x00, - 0x04, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE7_DEMO[] = { - 0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x20, 0xC4, 0x06, 0x00, - 0x00, 0x00, 0x06, 0x06, 0x00, 0x03, 0x00, 0xFF, 0x06, 0x00, - 0x02, 0x00, 0x06, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x01, 0x00, 0x01, 0x00, 0x62, 0x00, 0x02, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x03, 0x00, 0x02, 0x00, 0x62, 0x00, - 0x26, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE9_DEMO[] = { - 0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x20, 0xC4, 0x08, 0x00, - 0x00, 0x00, 0x08, 0x08, 0x00, 0x03, 0x00, 0xFF, 0x08, 0x00, - 0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x07, 0x00, 0x01, 0x00, 0x62, 0x00, 0x08, 0x00, - 0x02, 0x00, 0x62, 0x00, 0x09, 0x00, 0x01, 0x00, 0x62, 0x00, - 0x0A, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE10_DEMO[] = { - 0x00, 0x61, 0x00, 0x0E, 0x00, 0x30, 0x18, 0x9B, 0x09, 0x00, - 0x00, 0x00, 0x09, 0x09, 0x00, 0x03, 0x00, 0xFF, 0x09, 0x00, - 0x02, 0x00, 0x09, 0x00, 0x01, 0x00, 0xB4, 0x10, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x03, 0x00, - 0x62, 0x00, 0x04, 0x00, 0x01, 0x00, 0x62, 0x00, 0x05, 0x00, - 0x02, 0x00, 0x62, 0x00, 0x06, 0x00, 0x02, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE11_DEMO[] = { - 0x01, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x30, 0x14, 0x0A, 0x00, - 0x00, 0x00, 0x0A, 0x0A, 0x00, 0x03, 0x00, 0xFF, 0x0A, 0x00, - 0x02, 0x00, 0x0A, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x15, 0x00, 0x01, 0x00, 0x62, 0x00, 0x16, 0x00, - 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE12_DEMO[] = { - 0x01, 0x61, 0x00, 0x0E, 0x00, 0x40, 0x3A, 0x22, 0x0B, 0x00, - 0x00, 0x00, 0x0B, 0x0B, 0x00, 0x03, 0x00, 0xFF, 0x0B, 0x00, - 0x02, 0x00, 0x0B, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE13_DEMO[] = { - 0x01, 0x61, 0x00, 0x08, 0x00, 0x40, 0x30, 0x14, 0x0C, 0x00, - 0x00, 0x00, 0x0C, 0x0C, 0x00, 0x03, 0x00, 0xFF, 0x0C, 0x00, - 0x02, 0x00, 0x0C, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x18, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x17, 0x00, 0x01, 0x00, 0x62, 0x00, 0x11, 0x00, - 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE14_DEMO[] = { - 0x01, 0x61, 0x00, 0x0D, 0x00, 0x40, 0x36, 0x2C, 0x0D, 0x00, - 0x00, 0x00, 0x0D, 0x0D, 0x00, 0x03, 0x00, 0xFF, 0x0D, 0x00, - 0x02, 0x00, 0x0D, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE15_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3E, 0x33, 0xFF, 0xFF, - 0x00, 0x00, 0xFF, 0x0E, 0x00, 0x05, 0x00, 0x0E, 0x00, 0x04, - 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF -}; - -const byte ROOM_TABLE16_DEMO[] = { - 0x01, 0x61, 0x00, 0x10, 0x00, 0x28, 0x0C, 0x5E, 0x0F, 0x00, - 0x00, 0x00, 0x0F, 0x0F, 0x00, 0x02, 0x00, 0xFF, 0x0F, 0x00, - 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE17_DEMO[] = { - 0x02, 0x61, 0x00, 0x10, 0x00, 0x40, 0x20, 0x30, 0x10, 0x00, - 0x00, 0x00, 0x10, 0x10, 0x00, 0x03, 0x00, 0xFF, 0x10, 0x00, - 0x02, 0x00, 0x10, 0x00, 0x01, 0x00, 0x6E, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE18_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x19, 0x2B, 0x11, 0x00, - 0x00, 0x00, 0x11, 0x11, 0x00, 0x03, 0x00, 0xFF, 0x11, 0x00, - 0x02, 0x00, 0x11, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE19_DEMO[] = { - 0x01, 0x61, 0x00, 0x11, 0x00, 0x2D, 0x14, 0x3C, 0x12, 0x00, - 0x00, 0x00, 0x12, 0x12, 0x00, 0x03, 0x00, 0xFF, 0x12, 0x00, - 0x02, 0x00, 0x12, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE20_DEMO[] = { - 0x02, 0x61, 0x00, 0x12, 0x00, 0x2D, 0x28, 0x28, 0x13, 0x00, - 0x00, 0x00, 0x13, 0x13, 0x00, 0x03, 0x00, 0xFF, 0x13, 0x00, - 0x02, 0x00, 0x13, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x29, 0x00, 0x01, 0x00, 0x62, 0x00, 0x24, 0x00, - 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE21_DEMO[] = { - 0x01, 0x61, 0x00, 0x16, 0x00, 0x28, 0x0C, 0x5E, 0x14, 0x00, - 0x00, 0x00, 0x14, 0x14, 0x00, 0x02, 0x00, 0xFF, 0x14, 0x00, - 0x01, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE22_DEMO[] = { - 0x01, 0x61, 0x00, 0x12, 0x00, 0x3C, 0x2A, 0x29, 0x15, 0x00, - 0x00, 0x00, 0x15, 0x15, 0x00, 0x03, 0x00, 0xFF, 0x15, 0x00, - 0x02, 0x00, 0x15, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x23, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE23_DEMO[] = { - 0x01, 0x61, 0x00, 0x13, 0x00, 0x40, 0x2D, 0x64, 0x16, 0x00, - 0x00, 0x00, 0xFF, 0x16, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, - 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x16, 0x00, 0x02, - 0x00, 0xFF, 0xFF, 0x62, 0x00, 0x2A, 0x00, 0x01, 0x00, 0xFF, - 0xFF -}; - -const byte ROOM_TABLE24_DEMO[] = { - 0x02, 0x61, 0x00, 0x14, 0x00, 0x40, 0x3C, 0x19, 0x17, 0x00, - 0x00, 0x00, 0x17, 0x17, 0x00, 0x03, 0x00, 0xFF, 0x17, 0x00, - 0x02, 0x00, 0x17, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE25_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x3F, 0x5A, 0x18, 0x00, - 0x00, 0x00, 0x18, 0x18, 0x00, 0x02, 0x00, 0xFF, 0x18, 0x00, - 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xDC, 0xA0, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE26_DEMO[] = { - 0x02, 0x61, 0x00, 0x17, 0x00, 0x3E, 0x32, 0x80, 0x19, 0x00, - 0x00, 0x00, 0x19, 0x19, 0x00, 0x03, 0x00, 0xFF, 0x19, 0x00, - 0x02, 0x00, 0x19, 0x00, 0x01, 0x00, 0x64, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE27_DEMO[] = { - 0x01, 0x61, 0x00, 0x19, 0x00, 0x34, 0x28, 0x28, 0x1A, 0x00, - 0x00, 0x00, 0x1A, 0x1A, 0x00, 0x03, 0x00, 0xFF, 0x1A, 0x00, - 0x02, 0x00, 0x1A, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x28, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x2B, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE28_DEMO[] = { - 0x02, 0x61, 0x00, 0x18, 0x00, 0x40, 0x3A, 0x6C, 0x1B, 0x00, - 0x00, 0x00, 0x1B, 0x1B, 0x00, 0x03, 0x00, 0xFF, 0x1B, 0x00, - 0x02, 0x00, 0x1B, 0x00, 0x01, 0x00, 0xC8, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE30_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x20, 0x18, 0x73, 0x1D, 0x00, - 0x00, 0x00, 0x1D, 0x1D, 0x00, 0x03, 0x00, 0xFF, 0x1D, 0x00, - 0x02, 0x00, 0x1D, 0x00, 0x01, 0x00, 0x80, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE31_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x1C, 0x27, 0x1E, 0x00, - 0x00, 0x00, 0x1E, 0x1E, 0x00, 0x03, 0x00, 0xFF, 0x1E, 0x00, - 0x02, 0x00, 0x1E, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE32_DEMO[] = { - 0x02, 0x61, 0x00, 0x1B, 0x00, 0x40, 0x10, 0x78, 0x1F, 0x00, - 0x00, 0x00, 0x1F, 0x1F, 0x00, 0x03, 0x00, 0xFF, 0x1F, 0x00, - 0x02, 0x00, 0x1F, 0x00, 0x01, 0x00, 0xFE, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE33_DEMO[] = { - 0x01, 0x61, 0x00, 0x1E, 0x00, 0x40, 0x3B, 0x4B, 0x20, 0x00, - 0x00, 0x00, 0x20, 0x20, 0x00, 0x03, 0x00, 0xFF, 0x20, 0x00, - 0x02, 0x00, 0x20, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE34_DEMO[] = { - 0x01, 0x61, 0x00, 0x04, 0x00, 0x30, 0x10, 0x51, 0x21, 0x00, - 0x00, 0x00, 0x21, 0x21, 0x00, 0x02, 0x00, 0xFF, 0x21, 0x00, - 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x2E, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE37_DEMO[] = { - 0x02, 0x61, 0x00, 0x04, 0x00, 0x3E, 0x3A, 0x32, 0x24, 0x00, - 0x00, 0x00, 0x24, 0x24, 0x00, 0x03, 0x00, 0xFF, 0x24, 0x00, - 0x02, 0x00, 0x24, 0x00, 0x01, 0x00, 0xB4, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x2D, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0x62, 0x00, 0x2E, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE38_DEMO[] = { - 0x03, 0x61, 0x00, 0x08, 0x00, 0x3F, 0x3F, 0xFF, 0x25, 0x00, - 0x00, 0x00, 0x25, 0x25, 0x00, 0x03, 0x00, 0xFF, 0x25, 0x00, - 0x02, 0x00, 0x25, 0x00, 0x01, 0x00, 0xFF, 0x40, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x62, 0x00, 0x21, 0x00, 0x01, 0x00, 0x62, 0x00, 0x25, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x1F, 0x00, 0x01, 0x00, 0x62, 0x00, - 0x30, 0x00, 0x01, 0x00, 0x62, 0x00, 0x32, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE39_DEMO[] = { - 0x01, 0x61, 0x00, 0x08, 0x00, 0x40, 0x32, 0x50, 0x26, 0x00, - 0x00, 0x00, 0x26, 0x26, 0x00, 0x03, 0x00, 0xFF, 0x26, 0x00, - 0x02, 0x00, 0x26, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x62, 0x00, 0x22, 0x00, 0x02, 0x00, 0x62, 0x00, 0x31, 0x00, - 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE40_DEMO[] = { - 0x02, 0x61, 0x00, 0x09, 0x00, 0x40, 0x3F, 0x37, 0x27, 0x00, - 0x00, 0x00, 0x27, 0x27, 0x00, 0x03, 0x00, 0xFF, 0x27, 0x00, - 0x02, 0x00, 0x27, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x04, 0x00, - 0x62, 0x00, 0x1B, 0x00, 0x03, 0x00, 0x62, 0x00, 0x1C, 0x00, - 0x01, 0x00, 0x62, 0x00, 0x1F, 0x00, 0x02, 0x00, 0x62, 0x00, - 0x23, 0x00, 0x01, 0x00, 0x62, 0x00, 0x32, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE43_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1B, 0x6E, 0x2A, 0x00, - 0x00, 0x00, 0x2A, 0x2A, 0x00, 0x03, 0x00, 0xFF, 0x2A, 0x00, - 0x02, 0x00, 0x2A, 0x00, 0x01, 0x00, 0xA5, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE45_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1D, 0xBE, 0x2C, 0x00, - 0x00, 0x00, 0x2C, 0x2C, 0x00, 0x03, 0x00, 0xFF, 0x2C, 0x00, - 0x02, 0x00, 0x2C, 0x00, 0x01, 0x00, 0x50, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE46_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x1D, 0x78, 0x2D, 0x00, - 0x00, 0x00, 0x2D, 0x2D, 0x00, 0x03, 0x00, 0xFF, 0x2D, 0x00, - 0x02, 0x00, 0x2D, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE47_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0x2E, 0x00, - 0x00, 0x00, 0x2E, 0x2E, 0x00, 0x03, 0x00, 0xFF, 0x2E, 0x00, - 0x02, 0x00, 0x2E, 0x00, 0x01, 0x00, 0xF0, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE48_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0x2F, 0x00, - 0x00, 0x00, 0x2F, 0x2F, 0x00, 0x03, 0x00, 0xFF, 0x2F, 0x00, - 0x02, 0x00, 0x2F, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE51_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x32, 0xFF, 0xFF, - 0x00, 0x00, 0xFF, 0x32, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x04, - 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x32, - 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF -}; - -const byte ROOM_TABLE55_DEMO[] = { - 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x28, 0x1E, 0x6E, 0x36, 0x00, - 0x00, 0x00, 0x36, 0x36, 0x00, 0x03, 0x00, 0xFF, 0x36, 0x00, - 0x02, 0x00, 0x36, 0x00, 0x01, 0x00, 0xFF, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0x36, 0x00, 0x04, 0x00, 0xFF, 0xFF, 0xFF, 0xFF -}; - -const byte ROOM_TABLE58_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x32, 0x14, 0x73, 0x39, 0x00, - 0x00, 0x00, 0x39, 0x39, 0x00, 0x03, 0x00, 0xFF, 0x39, 0x00, - 0x02, 0x00, 0x39, 0x00, 0x01, 0x00, 0xB4, 0x00, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xFF, 0xFF -}; - -const byte ROOM_TABLE62_DEMO[] = { - 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x41, 0x3F, 0x19, 0x3D, 0x00, - 0x00, 0x00, 0x3D, 0x3D, 0x00, 0x03, 0x00, 0x3E, 0x3D, 0x00, - 0x04, 0x00, 0xFF, 0x3D, 0x00, 0x02, 0x00, 0x3D, 0x00, 0x01, - 0x00, 0xBE, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x62, - 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00 -}; - -const byte *const ROOM_TABLE_DEMO[] = { - ROOM_TABLE1_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE5_DEMO, - ROOM_TABLE6_DEMO, ROOM_TABLE7_DEMO, nullptr, ROOM_TABLE9_DEMO, ROOM_TABLE10_DEMO, - ROOM_TABLE11_DEMO, ROOM_TABLE12_DEMO, ROOM_TABLE13_DEMO, ROOM_TABLE14_DEMO, ROOM_TABLE15_DEMO, - ROOM_TABLE16_DEMO, ROOM_TABLE17_DEMO, ROOM_TABLE18_DEMO, ROOM_TABLE19_DEMO, ROOM_TABLE20_DEMO, - ROOM_TABLE21_DEMO, ROOM_TABLE22_DEMO, ROOM_TABLE23_DEMO, ROOM_TABLE24_DEMO, ROOM_TABLE25_DEMO, - ROOM_TABLE26_DEMO, ROOM_TABLE27_DEMO, ROOM_TABLE28_DEMO, nullptr, ROOM_TABLE30_DEMO, - ROOM_TABLE31_DEMO, ROOM_TABLE32_DEMO, ROOM_TABLE33_DEMO, ROOM_TABLE34_DEMO, nullptr, - nullptr, ROOM_TABLE37_DEMO, ROOM_TABLE38_DEMO, ROOM_TABLE39_DEMO, ROOM_TABLE40_DEMO, - nullptr, nullptr, ROOM_TABLE43_DEMO, nullptr, ROOM_TABLE45_DEMO, - ROOM_TABLE46_DEMO, ROOM_TABLE47_DEMO, ROOM_TABLE48_DEMO, nullptr, nullptr, - ROOM_TABLE51_DEMO, nullptr, nullptr, nullptr, ROOM_TABLE55_DEMO, - nullptr, nullptr, ROOM_TABLE58_DEMO, nullptr, nullptr, - nullptr, ROOM_TABLE62_DEMO, nullptr, nullptr -}; - -const int ROOM_NUMB = 63; - -const byte ELAINE[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x41, 0x41, 0x0, 0x1, 0x0, 0xFF, 0x41, 0x0, 0x2, - 0x0, 0x41, 0x0, 0x0, 0x0, 0x41, 0x0, 0x3, 0x0, 0x41, 0x0, 0x25, 0x0, 0x41, - 0x0, 0x4, 0x0, 0x41, 0x0, 0x26, 0x0, 0x41, 0x0, 0x5, 0x0, 0x41, 0x0, 0x27, - 0x0, 0x41, 0x0, 0x6, 0x0, 0x41, 0x0, 0x28, 0x0, 0x41, 0x0, 0x7, 0x0, 0x41, - 0x0, 0x29, 0x0, 0x41, 0x0, 0x8, 0x0, 0x41, 0x0, 0x2A, 0x0, 0x41, 0x0, 0x9, - 0x0, 0x41, 0x0, 0x2B, 0x0, 0x41, 0x0, 0x0A, 0x0, 0x41, 0x0, 0x2C, 0x0, 0x41, - 0x0, 0x0B, 0x0, 0x41, 0x0, 0x2D, 0x0, 0x41, 0x0, 0x0C, 0x0, 0x41, 0x0, 0x2E, - 0x0, 0x41, 0x0, 0x0D, 0x0, 0x41, 0x0, 0x2F, 0x0, 0x41, 0x0, 0x0E, 0x0, 0x41, - 0x0, 0x30, 0x0, 0x41, 0x0, 0x0F, 0x0, 0x41, 0x0, 0x31, 0x0, 0x41, 0x0, 0x10, - 0x0, 0x41, 0x0, 0x32, 0x0, 0x41, 0x0, 0x11, 0x0, 0x41, 0x0, 0x33, 0x0, 0x41, - 0x0, 0x12, 0x0, 0x41, 0x0, 0x34, 0x0, 0x41, 0x0, 0x13, 0x0, 0x41, 0x0, 0x35, - 0x0, 0x41, 0x0, 0x14, 0x0, 0x41, 0x0, 0x36, 0x0, 0x41, 0x0, 0x15, 0x0, 0x41, - 0x0, 0x37, 0x0, 0x41, 0x0, 0x16, 0x0, 0x41, 0x0, 0x38, 0x0, 0x41, 0x0, 0x17, - 0x0, 0x41, 0x0, 0x39, 0x0, 0x41, 0x0, 0x18, 0x0, 0x41, 0x0, 0x3A, 0x0, 0x41, - 0x0, 0x19, 0x0, 0x41, 0x0, 0x3B, 0x0, 0x41, 0x0, 0x1A, 0x0, 0x41, 0x0, 0x3C, - 0x0, 0x41, 0x0, 0x1B, 0x0, 0x41, 0x0, 0x3D, 0x0, 0x41, 0x0, 0x1C, 0x0, 0x41, - 0x0, 0x3E, 0x0, 0x41, 0x0, 0x1D, 0x0, 0x41, 0x0, 0x3F, 0x0, 0x41, 0x0, 0x1E, - 0x0, 0x41, 0x0, 0x40, 0x0, 0x41, 0x0, 0x1F, 0x0, 0x41, 0x0, 0x41, 0x0, 0x41, - 0x0, 0x20, 0x0, 0x41, 0x0, 0x42, 0x0, 0x41, 0x0, 0x21, 0x0, 0x41, 0x0, 0x43, - 0x0, 0x41, 0x0, 0x22, 0x0, 0x41, 0x0, 0x44, 0x0, 0x41, 0x0, 0x23, 0x0, 0x41, - 0x0, 0x45, 0x0, 0x41, 0x0, 0x24, 0x0, 0x41, 0x0, 0x46, 0x0, 0xFF, 0xFF -}; - -const byte LIB[] = { - 0x1, 0xFF, 0xFF, 0x42, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x42, 0x42, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, - 0x0, 0x42, 0x0, 0x0, 0x0, 0x42, 0x0, 0x3, 0x0, 0x42, 0x0, 0x18, 0x0, 0x42, - 0x0, 0x4, 0x0, 0x42, 0x0, 0x19, 0x0, 0x42, 0x0, 0x5, 0x0, 0x42, 0x0, 0x1A, - 0x0, 0x42, 0x0, 0x6, 0x0, 0x42, 0x0, 0x1B, 0x0, 0x42, 0x0, 0x7, 0x0, 0x42, - 0x0, 0x1C, 0x0, 0x42, 0x0, 0x8, 0x0, 0x42, 0x0, 0x1D, 0x0, 0x42, 0x0, 0x9, - 0x0, 0x42, 0x0, 0x1E, 0x0, 0x42, 0x0, 0x0A, 0x0, 0x42, 0x0, 0x1F, 0x0, 0x42, - 0x0, 0x0B, 0x0, 0x42, 0x0, 0x20, 0x0, 0x42, 0x0, 0x0C, 0x0, 0x42, 0x0, 0x21, - 0x0, 0x42, 0x0, 0x0D, 0x0, 0x42, 0x0, 0x22, 0x0, 0x42, 0x0, 0x0E, 0x0, 0x42, - 0x0, 0x23, 0x0, 0x42, 0x0, 0x0F, 0x0, 0x42, 0x0, 0x24, 0x0, 0x42, 0x0, 0x10, - 0x0, 0x42, 0x0, 0x25, 0x0, 0x42, 0x0, 0x11, 0x0, 0x42, 0x0, 0x26, 0x0, 0x42, - 0x0, 0x12, 0x0, 0x42, 0x0, 0x27, 0x0, 0x42, 0x0, 0x13, 0x0, 0x42, 0x0, 0x28, - 0x0, 0x42, 0x0, 0x14, 0x0, 0x42, 0x0, 0x29, 0x0, 0x42, 0x0, 0x15, 0x0, 0x42, - 0x0, 0x2A, 0x0, 0x42, 0x0, 0x16, 0x0, 0x42, 0x0, 0x2B, 0x0, 0x42, 0x0, 0x17, - 0x0, 0x42, 0x0, 0x2C, 0x0, 0xFF, 0xFF -}; - -const byte FLASHBACK[] = { - 0x2, 0x1B, 0x0, 0x1C, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x26, 0x0, 0x1C, 0x0, 0x0, 0x0, 0x1C, - 0x0, 0x5, 0x0, 0x1C, 0x0, 0x0E, 0x0, 0x1C, 0x0, 0x6, 0x0, 0x1C, 0x0, 0x0F, - 0x0, 0x1C, 0x0, 0x7, 0x0, 0x1C, 0x0, 0x0C, 0x0, 0x1C, 0x0, 0x8, 0x0, 0x1C, - 0x0, 0x0D, 0x0, 0x2, 0x0, 0x1, 0x0, 0x1C, 0x0, 0x10, 0x0, 0x2, 0x0, 0x2, 0x0, 0x1C, - 0x0, 0x11, 0x0, 0x1C, 0x0, 0x9, 0x0, 0x1C, 0x0, 0x12, 0x0, 0x1C, 0x0, 0x0A, - 0x0, 0x1C, 0x0, 0x13, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x14, 0x0, 0x1C, - 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x15, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x16, - 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x17, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, - 0x0, 0x18, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x19, 0x0, 0x1C, 0x0, 0x0B, - 0x0, 0x1C, 0x0, 0x1A, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1B, 0x0, 0x1C, - 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1C, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1D, - 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x1E, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, - 0x0, 0x1F, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x20, 0x0, 0x1C, 0x0, 0x0B, - 0x0, 0x1C, 0x0, 0x21, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x22, 0x0, 0x1C, - 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x23, 0x0, 0x1C, 0x0, 0x0B, 0x0, 0x1C, 0x0, 0x24, - 0x0, 0xFF, 0xFF -}; - -const byte ALLENDIE[] = { - 0x2, 0xFF, 0xFF, 0x49, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x49, - 0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0x49, 0x0, 0x5, 0x0, 0x62, 0x0, 0x3A, - 0x0, 0x49, 0x0, 0x6, 0x0, 0x49, 0x0, 0x7, 0x0, 0xFF, 0xFF -}; - -const byte OVERBOARD[] = { - 0x2, 0xFF, 0xFF, 0x22, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x22, 0x22, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x22, 0x0, 0x0, 0x0, 0x22, 0x0, 0x3, 0x0, 0x22, 0x0, 0x6, 0x0, 0x22, - 0x0, 0x4, 0x0, 0x22, 0x0, 0x7, 0x0, 0x22, 0x0, 0x5, 0x0, 0x62, 0x0, 0x1D, 0x0, - 0x22, 0x0, 0x5, 0x0, 0x62, 0x0, 0x24, 0x0, 0xFF, 0xFF -}; - -const byte PILOT2[] = { - 0x0, 0x12, 0x0, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x46, 0x46, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x46, 0x0, 0x0, 0x0, 0x46, 0x0, 0x2, 0x0, 0x46, 0x0, 0x0A, 0x0, 0x46, - 0x0, 0x3, 0x0, 0x46, 0x0, 0x0B, 0x0, 0x46, 0x0, 0x4, 0x0, 0x46, 0x0, 0x0C, - 0x0, 0x46, 0x0, 0x5, 0x0, 0x46, 0x0, 0x0D, 0x0, 0x46, 0x0, 0x6, 0x0, 0x46, - 0x0, 0x0E, 0x0, 0x46, 0x0, 0x7, 0x0, 0x46, 0x0, 0x0F, 0x0, 0x46, 0x0, 0x8, - 0x0, 0x46, 0x0, 0x10, 0x0, 0x46, 0x0, 0x9, 0x0, 0x46, 0x0, 0x11, 0x0, 0x46, - 0x0, 0x9, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF -}; - -const byte TIKAGENT[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x43, 0x43, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, - 0x0, 0x43, 0x0, 0x0, 0x0, 0x43, 0x0, 0x2, 0x0, 0x43, 0x0, 0x12, 0x0, 0x43, - 0x0, 0x3, 0x0, 0x43, 0x0, 0x13, 0x0, 0x43, 0x0, 0x4, 0x0, 0x43, 0x0, 0x14, - 0x0, 0x43, 0x0, 0x5, 0x0, 0x43, 0x0, 0x15, 0x0, 0x43, 0x0, 0x6, 0x0, 0x43, - 0x0, 0x16, 0x0, 0x43, 0x0, 0x7, 0x0, 0x43, 0x0, 0x17, 0x0, 0x43, 0x0, 0x8, - 0x0, 0x43, 0x0, 0x18, 0x0, 0x43, 0x0, 0x9, 0x0, 0x43, 0x0, 0x19, 0x0, 0x43, - 0x0, 0x0A, 0x0, 0x43, 0x0, 0x1A, 0x0, 0x43, 0x0, 0x0B, 0x0, 0x43, 0x0, 0x1B, - 0x0, 0x43, 0x0, 0x0C, 0x0, 0x43, 0x0, 0x1C, 0x0, 0x43, 0x0, 0x0D, 0x0, 0x43, - 0x0, 0x1D, 0x0, 0x43, 0x0, 0x0E, 0x0, 0x43, 0x0, 0x1E, 0x0, 0x43, 0x0, 0x0F, - 0x0, 0x43, 0x0, 0x1F, 0x0, 0x43, 0x0, 0x10, 0x0, 0x43, 0x0, 0x20, 0x0, 0x43, - 0x0, 0x11, 0x0, 0x43, 0x0, 0x21, 0x0, 0xFF, 0xFF -}; - -const byte BARTENDER[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x44, 0x44, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x44, 0x0, 0x0, 0x0, 0x44, 0x0, 0x2, 0x0, 0x44, 0x0, 0x8, 0x0, 0x44, 0x0, - 0x3, 0x0, 0x44, 0x0, 0x9, 0x0, 0x44, 0x0, 0x4, 0x0, 0x44, 0x0, 0x0A, 0x0, 0x44, - 0x0, 0x5, 0x0, 0x44, 0x0, 0x0B, 0x0, 0x44, 0x0, 0x6, 0x0, 0x44, 0x0, 0x0C, - 0x0, 0x44, 0x0, 0x7, 0x0, 0x44, 0x0, 0x0D, 0x0, 0xFF, 0xFF -}; - -const byte PILOT1[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x45, 0x45, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x45, 0x0, 0x0, 0x0, 0x45, 0x0, 0x2, 0x0, 0x45, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte COOK[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x47, 0x47, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0x2, 0x0, 0x47, 0x0, 0x0, 0x0, 0x47, 0x0, 0x2, 0x0, 0x47, 0x0, 0x10, 0x0, 0x47, - 0x0, 0x3, 0x0, 0x47, 0x0, 0x11, 0x0, 0x47, 0x0, 0x4, 0x0, 0x47, 0x0, 0x12, - 0x0, 0x47, 0x0, 0x5, 0x0, 0x47, 0x0, 0x13, 0x0, 0x47, 0x0, 0x6, 0x0, 0x47, - 0x0, 0x14, 0x0, 0x47, 0x0, 0x7, 0x0, 0x47, 0x0, 0x15, 0x0, 0x47, 0x0, 0x8, - 0x0, 0x47, 0x0, 0x16, 0x0, 0x47, 0x0, 0x9, 0x0, 0x47, 0x0, 0x17, 0x0, 0x47, - 0x0, 0x0A, 0x0, 0x47, 0x0, 0x18, 0x0, 0x47, 0x0, 0x0B, 0x0, 0x47, 0x0, 0x19, - 0x0, 0x47, 0x0, 0x0C, 0x0, 0x47, 0x0, 0x1A, 0x0, 0x47, 0x0, 0x0D, 0x0, 0x47, - 0x0, 0x1B, 0x0, 0x47, 0x0, 0x0E, 0x0, 0x47, 0x0, 0x1C, 0x0, 0x47, 0x0, 0x0F, - 0x0, 0x47, 0x0, 0x1D, 0x0, 0xFF, 0xFF -}; - -const byte BEXPLODE[] = { - 0x2, 0xFF, 0xFF, 0x28, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x28, 0x28, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x28, 0x0, 0x0, 0x0, 0x28, 0x0, 0x3, 0x0, 0x28, 0x0, 0x9, 0x0, 0x28, - 0x0, 0x4, 0x0, 0x28, 0x0, 0x0A, 0x0, 0x28, 0x0, 0x5, 0x0, 0x28, 0x0, 0x0B, - 0x0, 0x28, 0x0, 0x6, 0x0, 0x62, 0x0, 0x23, 0x0, 0x28, 0x0, 0x7, 0x0, 0x62, - 0x0, 0x23, 0x0, 0x28, 0x0, 0x8, 0x0, 0x62, 0x0, 0x23, 0x0, 0xFF, 0xFF -}; - -const byte THORNICK[] = { - 0x2, 0x7, 0x0, 0x7, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x0, - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x0, 0x0, 0x0, 0x7, 0x0, 0x2, 0x0, - 0x7, 0x0, 0x5, 0x0, 0x7, 0x0, 0x3, 0x0, 0x7, 0x0, 0x6, 0x0, 0x7, 0x0, 0x3, - 0x0, 0x7, 0x0, 0x7, 0x0, 0x7, 0x0, 0x4, 0x0, 0x7, 0x0, 0x8, 0x0, 0xFF, 0xFF -}; - -const byte MAYA[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0x48, 0x48, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, - 0x48, 0x0, 0x0, 0x0, 0x48, 0x0, 0x2, 0x0, 0x48, 0x0, 0x13, 0x0, 0x48, - 0x0, 0x3, 0x0, 0x48, 0x0, 0x14, 0x0, 0x48, 0x0, 0x4, 0x0, 0x48, 0x0, 0x15, - 0x0, 0x48, 0x0, 0x5, 0x0, 0x48, 0x0, 0x16, 0x0, 0x48, 0x0, 0x6, 0x0, 0x48, - 0x0, 0x17, 0x0, 0x48, 0x0, 0x7, 0x0, 0x48, 0x0, 0x18, 0x0, 0x48, 0x0, 0x8, - 0x0, 0x48, 0x0, 0x19, 0x0, 0x48, 0x0, 0x9, 0x0, 0x48, 0x0, 0x1A, 0x0, 0x48, - 0x0, 0x0A, 0x0, 0x48, 0x0, 0x1B, 0x0, 0x48, 0x0, 0x0B, 0x0, 0x48, 0x0, 0x1C, - 0x0, 0x48, 0x0, 0x0C, 0x0, 0x48, 0x0, 0x1D, 0x0, 0x48, 0x0, 0x0D, 0x0, 0x48, - 0x0, 0x1E, 0x0, 0x48, 0x0, 0x0E, 0x0, 0x48, 0x0, 0x1F, 0x0, 0x48, 0x0, 0x0F, - 0x0, 0x48, 0x0, 0x20, 0x0, 0x48, 0x0, 0x10, 0x0, 0x48, 0x0, 0x21, 0x0, 0x48, - 0x0, 0x11, 0x0, 0x48, 0x0, 0x22, 0x0, 0x48, 0x0, 0x12, 0x0, 0x48, 0x0, 0x23, - 0x0, 0xFF, 0xFF -}; - -const byte CAPTAIN[] = { - 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x4A, 0x4A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0x2, 0x0, 0x4A, 0x0, 0x0, 0x0, 0x4A, 0x0, 0x2, 0x0, 0x4A, 0x0, 0x0E, 0x0, 0x4A, - 0x0, 0x3, 0x0, 0x4A, 0x0, 0x0F, 0x0, 0x4A, 0x0, 0x4, 0x0, 0x4A, 0x0, 0x10, - 0x0, 0x4A, 0x0, 0x5, 0x0, 0x4A, 0x0, 0x11, 0x0, 0x4A, 0x0, 0x6, 0x0, 0x4A, - 0x0, 0x12, 0x0, 0x4A, 0x0, 0x7, 0x0, 0x4A, 0x0, 0x13, 0x0, 0x4A, 0x0, 0x8, - 0x0, 0x4A, 0x0, 0x14, 0x0, 0x4A, 0x0, 0x9, 0x0, 0x4A, 0x0, 0x15, 0x0, 0x4A, - 0x0, 0x0A, 0x0, 0x4A, 0x0, 0x16, 0x0, 0x4A, 0x0, 0x0B, 0x0, 0x4A, 0x0, 0x17, - 0x0, 0x4A, 0x0, 0x0C, 0x0, 0x4A, 0x0, 0x18, 0x0, 0x4A, 0x0, 0x0D, 0x0, 0x4A, - 0x0, 0x19, 0x0, 0xFF, 0xFF -}; - -const byte ALLEN[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x1E, 0x4C, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x4C, 0x0, 0x0, 0x0, 0x4C, 0x0, 0x2, 0x0, 0x4C, 0x0, 0x3, 0x0, - 0xFF, 0xFF -}; - -const byte ARCH[] = { - 0x1, 0x2B, 0x0, 0x4B, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0x2B, 0x4B, 0x0, 0x40, 0x0, 0xFF, 0x4B, 0x0, 0x41, 0x0, - 0x4B, 0x0, 0x0, 0x0, 0x4B, 0x0, 0x2, 0x0, 0x4B, 0x0, 0x4, 0x0, 0x4B, 0x0, 0x3, - 0x0, 0x4B, 0x0, 0x5, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x6, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x7, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x8, 0x0, 0x4B, - 0x0, 0x3, 0x0, 0x4B, 0x0, 0x9, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0A, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0B, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x0C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0D, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x0E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x0F, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x10, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x11, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x12, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x13, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x14, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x15, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x16, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x17, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x18, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x19, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x1A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1B, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x1C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1D, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x1E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x1F, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x20, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x21, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x22, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x23, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x24, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x25, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x26, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x27, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x28, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x29, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x2A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2B, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x2C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2D, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x2E, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x2F, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x30, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x31, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x32, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x33, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x34, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x35, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x36, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x37, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x38, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x39, 0x0, 0x4B, 0x0, - 0x3, 0x0, 0x4B, 0x0, 0x3A, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3B, 0x0, - 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3C, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, - 0x3D, 0x0, 0x4B, 0x0, 0x3, 0x0, 0x4B, 0x0, 0x3E, 0x0, 0x4B, 0x0, 0x3, 0x0, - 0x4B, 0x0, 0x3F, 0x0, 0xFF, 0xFF -}; - -const byte GUARD1[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x4D, 0x4D, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x4D, 0x0, 0x0, 0x0, 0x4D, 0x0, 0x2, 0x0, 0x4D, 0x0, 0x3, 0x0, - 0xFF, 0xFF -}; - -const byte MCANOE[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x4E, 0x4E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0x4E, 0x0, 0x0, 0x0, 0x4E, 0x0, 0x2, 0x0, 0x4E, 0x0, 0x3, 0x0, - 0xFF, 0xFF -}; - -const byte CAMPFIRE[] = { - 0x2, 0x35, 0x0, 0x35, 0x0, 0x3, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0x35, 0x35, 0x0, 0x1, 0x0, 0xFF, 0x35, 0x0, 0x2, 0x0, 0x35, - 0x0, 0x0, 0x0, 0x35, 0x0, 0x4, 0x0, 0x35, 0x0, 0x18, 0x0, 0x35, 0x0, 0x5, 0x0, - 0x35, 0x0, 0x19, 0x0, 0x35, 0x0, 0x6, 0x0, 0x35, 0x0, 0x1A, 0x0, 0x35, 0x0, - 0x7, 0x0, 0x35, 0x0, 0x1B, 0x0, 0x35, 0x0, 0x8, 0x0, 0x35, 0x0, 0x1C, 0x0, - 0x35, 0x0, 0x9, 0x0, 0x35, 0x0, 0x1D, 0x0, 0x35, 0x0, 0x0A, 0x0, 0x35, 0x0, - 0x1E, 0x0, 0x35, 0x0, 0x0B, 0x0, 0x35, 0x0, 0x1F, 0x0, 0x35, 0x0, 0x0C, - 0x0, 0x35, 0x0, 0x20, 0x0, 0x35, 0x0, 0x0D, 0x0, 0x35, 0x0, 0x21, 0x0, 0x35, - 0x0, 0x0E, 0x0, 0x35, 0x0, 0x22, 0x0, 0x35, 0x0, 0x0F, 0x0, 0x35, 0x0, 0x23, - 0x0, 0x35, 0x0, 0x10, 0x0, 0x35, 0x0, 0x24, 0x0, 0x35, 0x0, 0x11, 0x0, 0x35, - 0x0, 0x25, 0x0, 0x35, 0x0, 0x12, 0x0, 0x35, 0x0, 0x26, 0x0, 0x35, 0x0, 0x13, - 0x0, 0x35, 0x0, 0x27, 0x0, 0x35, 0x0, 0x14, 0x0, 0x35, 0x0, 0x28, 0x0, 0x35, - 0x0, 0x15, 0x0, 0x35, 0x0, 0x29, 0x0, 0x35, 0x0, 0x16, 0x0, 0x35, 0x0, 0x2A, - 0x0, 0x35, 0x0, 0x17, 0x0, 0x35, 0x0, 0x2B, 0x0, 0xFF, 0xFF -}; - -const byte COLONEL[] = { - 0x2, 0xFF, 0xFF, 0x0E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x0E, 0x0E, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x2, - 0x0, 0x4F, 0x0, 0x0, 0x0, 0x4F, 0x0, 0x1, 0x0, 0x4F, 0x0, 0x2, 0x0, 0x0E, 0x0, - 0x8, 0x0, 0x4F, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte SOLDIERS[] = { - 0x2, 0xFF, 0xFF, 0x50, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x50, 0x0, 0x0, 0x0, 0x50, - 0x0, 0x2, 0x0, 0x50, 0x0, 0x0, 0x0, 0xFF, 0xFF -}; - -const byte JWATER[] = { - 0x2, 0xFF, 0xFF, 0x51, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x51, 0x0, 0x0, 0x0, 0x51, - 0x0, 0x2, 0x0, 0x51, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte SHOOT[] = { - 0x2, 0xFF, 0xFF, 0x52, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x38, 0x52, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x52, 0x0, 0x0, 0x0, 0x52, 0x0, 0x3, 0x0, 0x52, 0x0, 0x5, 0x0, 0x52, - 0x0, 0x4, 0x0, 0x62, 0x0, 0x1F, 0x0, 0xFF, 0xFF -}; - -const byte ADIE[] = { - 0x2, 0xFF, 0xFF, 0x53, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x53, 0x0, 0x0, 0x0, 0x53, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x4, 0x0, 0x53, 0x0, 0x3, 0x0, 0x62, 0x0, 0x4, - 0x0, 0x53, 0x0, 0x4, 0x0, 0x62, 0x0, 0x4, 0x0, 0xFF, 0xFF -}; - -const byte DYNAMITE[] = { - 0x2, 0xFF, 0xFF, 0x54, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x2, 0x0, 0x54, 0x0, 0x0, 0x0, 0x54, - 0x0, 0x2, 0x0, 0x62, 0x0, 0x23, 0x0, 0xFF, 0xFF -}; - -const byte MAYASHOT[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x0, 0x0, 0x0, 0x0, 0x36, 0x55, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, - 0x3, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x2, 0x0, 0x62, 0x0, 0x1F, - 0x0, 0xFF, 0xFF -}; - -const byte OFFKEV[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0x4D, 0x29, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x29, 0x0, 0x0, 0x0, 0x29, 0x0, 0x2, 0x0, 0x29, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte VALLEY[] = { - 0x2, 0x3A, 0x0, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0x3A, 0x3A, 0x0, 0x2, 0x0, 0xFF, 0xFF, 0xFF, 0x3, 0x0, - 0x3A, 0x0, 0x0, 0x0, 0x3A, 0x0, 0x3, 0x0, 0x3A, 0x0, 0x5, 0x0, 0x3A, 0x0, - 0x4, 0x0, 0x62, 0x0, 0x27, 0x0, 0xFF, 0xFF -}; - -const byte MEANWHILE1[] = { - 0x2, 0xFF, 0xFF, 0x0E, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x0E, 0x0E, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x3, - 0x0, 0x0E, 0x0, 0x0, 0x0, 0x0E, 0x0, 0x6, 0x0, 0x0E, 0x0, 0x0A, 0x0, 0x0E, - 0x0, 0x7, 0x0, 0x0E, 0x0, 0x0B, 0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E, 0x0, 0x0C, - 0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E, 0x0, 0x0D, 0x0, 0x0E, 0x0, 0x8, 0x0, 0x0E, - 0x0, 0x0E, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x0E, 0x0, 0x0F, 0x0, 0x0E, 0x0, 0x9, - 0x0, 0x0E, 0x0, 0x10, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x0E, 0x0, 0x11, 0x0, 0x0E, - 0x0, 0x9, 0x0, 0x0E, 0x0, 0x12, 0x0, 0x0E, 0x0, 0x9, 0x0, 0x62, 0x0, 0x1A, - 0x0, 0xFF, 0xFF -}; - -const byte MAYATREE[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x30, 0x56, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x56, 0x0, 0x0, 0x0, 0x56, 0x0, 0x2, 0x0, 0x56, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte LOCO[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x31, 0x57, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x57, 0x0, 0x0, 0x0, 0x57, 0x0, 0x2, 0x0, 0x57, 0x0, 0x3, 0x0, 0xFF, 0xFF -}; - -const byte KISS[] = { - 0x2, 0xFF, 0xFF, 0x3A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x40, 0x40, 0x0, 0x5, 0x0, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x40, 0x0, 0x0, 0x0, 0x40, 0x0, 0x6, 0x0, 0x40, 0x0, 0x26, 0x0, 0x40, - 0x0, 0x7, 0x0, 0x40, 0x0, 0x27, 0x0, 0x40, 0x0, 0x8, 0x0, 0x40, 0x0, 0x28, - 0x0, 0x40, 0x0, 0x9, 0x0, 0x62, 0x0, 0x4E, 0x0, 0x40, 0x0, 0x0A, 0x0, 0x40, - 0x0, 0x29, 0x0, 0x40, 0x0, 0x0B, 0x0, 0x40, 0x0, 0x2A, 0x0, 0x40, 0x0, 0x0C, - 0x0, 0x40, 0x0, 0x2B, 0x0, 0x40, 0x0, 0x0D, 0x0, 0x40, 0x0, 0x2C, 0x0, 0x40, - 0x0, 0x0E, 0x0, 0x40, 0x0, 0x2D, 0x0, 0x40, 0x0, 0x0F, 0x0, 0x40, 0x0, 0x2E, - 0x0, 0x40, 0x0, 0x10, 0x0, 0x40, 0x0, 0x2F, 0x0, 0x40, 0x0, 0x11, 0x0, 0x40, - 0x0, 0x30, 0x0, 0x40, 0x0, 0x12, 0x0, 0x40, 0x0, 0x31, 0x0, 0x40, 0x0, 0x13, - 0x0, 0x40, 0x0, 0x32, 0x0, 0x40, 0x0, 0x14, 0x0, 0x40, 0x0, 0x33, 0x0, 0x40, - 0x0, 0x15, 0x0, 0x40, 0x0, 0x34, 0x0, 0x40, 0x0, 0x16, 0x0, 0x40, 0x0, 0x35, - 0x0, 0x40, 0x0, 0x17, 0x0, 0x40, 0x0, 0x36, 0x0, 0x40, 0x0, 0x18, 0x0, 0x40, - 0x0, 0x37, 0x0, 0x40, 0x0, 0x19, 0x0, 0x40, 0x0, 0x38, 0x0, 0x40, 0x0, 0x1A, - 0x0, 0x40, 0x0, 0x39, 0x0, 0x40, 0x0, 0x1B, 0x0, 0x40, 0x0, 0x3A, 0x0, 0x40, - 0x0, 0x1C, 0x0, 0x40, 0x0, 0x3B, 0x0, 0x40, 0x0, 0x1D, 0x0, 0x40, 0x0, 0x3C, - 0x0, 0x40, 0x0, 0x1E, 0x0, 0x40, 0x0, 0x3D, 0x0, 0x40, 0x0, 0x1F, 0x0, 0x40, - 0x0, 0x3E, 0x0, 0x40, 0x0, 0x20, 0x0, 0x40, 0x0, 0x3F, 0x0, 0x40, 0x0, 0x21, - 0x0, 0x40, 0x0, 0x40, 0x0, 0x40, 0x0, 0x22, 0x0, 0x40, 0x0, 0x41, 0x0, 0x40, - 0x0, 0x23, 0x0, 0x40, 0x0, 0x42, 0x0, 0x40, 0x0, 0x24, 0x0, 0x40, 0x0, 0x43, - 0x0, 0x40, 0x0, 0x25, 0x0, 0x40, 0x0, 0x44, 0x0, 0x40, 0x0, 0x25, 0x0, 0x40, - 0x0, 0x45, 0x0, 0x40, 0x0, 0x25, 0x0, 0x40, 0x0, 0x46, 0x0, 0x40, 0x0, 0x25, - 0x0, 0x40, 0x0, 0x47, 0x0, 0xFF, 0xFF -}; - -const byte ROBOT[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0x9, 0x58, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, - 0x58, 0x0, 0x0, 0x0, 0x58, 0x0, 0x0, 0x0, 0x58, 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte ANTKILL[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, - 0x0, 0x0, 0x3C, 0x59, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x59, - 0x0, 0x0, 0x0, 0x59, 0x0, 0x2, 0x0, 0x62, 0x0, 0x0E, 0x0, 0xFF, 0xFF -}; - -const byte LOCOHOT[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0x0, - 0x0, 0x0, 0x19, 0x5A, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x5A, - 0x0, 0x0, 0x0, 0x5A, 0x0, 0x2, 0x0, 0x62, 0x0, 0x3C, 0x0, 0xFF, 0xFF -}; - -const byte CRACK[] = { - 0x2, 0x38, 0x0, 0x38, 0x0, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, 0x0, - 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x38, - 0x0, 0x0, 0x0, 0x38, 0x0, 0x2, 0x0, 0xFF, 0xFF -}; - -const byte LETTER[] = { - 0x3, 0xFF, 0xFF, 0xFF, 0xFF, 0x1, 0x0, 0xFF, 0xFF, 0xFF, 0xFF, - 0x0, 0x0, 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, - 0x0, 0x0, 0x0, 0x30, 0x0, 0x1, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x6, 0x0, 0x30, - 0x0, 0x0, 0x0, 0x30, 0x0, 0x7, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x8, 0x0, 0x30, - 0x0, 0x0, 0x0, 0x30, 0x0, 0x9, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0A, 0x0, - 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0B, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, - 0x0C, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0D, 0x0, 0x30, 0x0, 0x0, 0x0, - 0x30, 0x0, 0x0E, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0F, 0x0, 0x30, 0x0, - 0x0, 0x0, 0x30, 0x0, 0x10, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x2, 0x0, 0x30, - 0x0, 0x0, 0x0, 0x30, 0x0, 0x3, 0x0, 0x30, 0x0, 0x0, 0x0, 0x30, 0x0, 0x4, 0x0, 0x30, - 0x0, 0x0, 0x0, 0x30, 0x0, 0x5, 0x0, 0xFF, 0xFF -}; - -const byte OVERBOARD_DEMO[] = { - 0x02, 0xFF, 0xFF, 0x22, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x00, 0x02, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0x00, 0x00, 0x00, 0x22, - 0x00, 0x03, 0x00, 0x22, 0x00, 0x06, 0x00, 0x22, 0x00, 0x04, - 0x00, 0x22, 0x00, 0x07, 0x00, 0x22, 0x00, 0x05, 0x00, 0x62, - 0x00, 0x1D, 0x00, 0x60, 0x00, 0x00, 0x00, 0x22, 0x00, 0x06, - 0x00, 0x60, 0x00, 0x01, 0x00, 0x22, 0x00, 0x07, 0x00, 0xFF, - 0xFF -}; - -const byte SHORE1[] = { - 0x02, 0xFF, 0xFF, 0x55, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x03, 0x00, - 0x55, 0x00, 0x00, 0x00, 0x55, 0x00, 0x02, 0x00, 0x62, 0x00, - 0x2E, 0x00, 0x55, 0x00, 0x02, 0x00, 0x62, 0x00, 0x2F, 0x00, - 0xFF, 0xFF -}; - -const byte CHAP8[] = { - 0x02, 0xFF, 0xFF, 0x60, 0x00, 0x03, 0x00, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x60, 0x00, 0x02, 0x00, 0xFF, 0xFF -}; - -const byte *const CHARTBL[] = { - ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT, - BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN, - ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS, - JWATER, SHOOT, ADIE, DYNAMITE, MAYASHOT, OFFKEV, VALLEY, - MEANWHILE1, MAYATREE, LOCO, KISS, ROBOT, ANTKILL, LOCOHOT, - CRACK, LETTER -}; - -const byte *const CHARTBL_DEMO[] = { - ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD_DEMO, PILOT2, TIKAGENT, - BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN, - ALLEN, ARCH, GUARD1, MCANOE, CAMPFIRE, COLONEL, SOLDIERS, - JWATER, SHOOT, ADIE, DYNAMITE, SHORE1, CHAP8 -}; - -const char *const INVENTORY_NAMES[] = { - "RAT", "ALCOHOL", "SAFE COMBINATION", "BEAKER", "MICROFILM", - "VAULT KEY", "BOLT CUTTERS", "BLOWGUN", "LOVE POTION", "MONEY", - "DARTS", "TAPE", "JUNGLE POTION", "MOVIE", "CABINET KEY", - "DISPLAY CASE KEY", "FLITCH'S CAR KEYS", "COAT HANGER", - "CROWBAR", "COMPASS", "MAP", "LETTER OPENER", "LETTER", - "DECODER", "DIPPED DART", "LOADED BLOWGUN", "CARD", "JERRYCAN", - "CIGARETTES", "BIKE PUMP", "PARACHUTE", "PESO", "PEPPERS", - "MACHETE", "POISON ROOT", "AMMUNITION", "PADDLE", "FISHING NET", - "RAT TRAP", "CHEESE", "LOADED TRAP", "KNIFE", "CHOPPED PEPPERS", - "LIGHTER", "LADDER", "SMALL POLE", "JEEP KEY", "CHAIN", "ARROW", - "FILLED JERRY CAN", "EXPLOSIVES", "GEIGER COUNTER", "VINE", - "GOLD NUGGET", "HOLLOW REED", "AMAZON QUEEN KEYS", "FISHING POLE", - "HARPOON", "RAG", "BOTTLE OF RUM", "RAG IN BOTTLE", "MOLOTOV COCKTAIL", - "JUNGLE PLANT", "LADLE", "WORM", "FISH", "FIREWORKS", "BAITED POLE", - "FILLED LADLE", "EMERALD", "SMALL KEY", "SCROLL", "LIT EXPLOSIVES", - "LIGHTER", "BROKEN SPEAR", "SHOE LACES", "TORCH", "LACES AND SPEAR", - "KNIFE SPEAR", "GARBAGE CAN", "RAFT", "INFLATED RAFT", - "JASON'S CAR KEYS", "PESO BILLS", "PLANK" -}; - -const int FONT2_INDEX[] = { - 62, 2, 6, - 0x0000, 0x0019, 0x0021, 0x002e, 0x0041, 0x005a, 0x0073, 0x008c, 0x0093, 0x009b, - 0x00a3, 0x00bc, 0x00d5, 0x00dd, 0x00ea, 0x00f1, 0x00fe, 0x010b, 0x0118, 0x0125, - 0x0132, 0x013f, 0x014c, 0x0159, 0x0166, 0x0173, 0x0180, 0x0187, 0x018e, 0x01a7, - 0x01b4, 0x01cd, 0x01dc, 0x01f5, 0x0208, 0x0215, 0x0222, 0x022f, 0x023c, 0x0249, - 0x025c, 0x0269, 0x0276, 0x0285, 0x0292, 0x029f, 0x02b2, 0x02c5, 0x02d2, 0x02df, - 0x02ee, 0x02fb, 0x0308, 0x0315, 0x0322, 0x032f, 0x0342, 0x034f, 0x0362, 0x036f, - 0x0388, 0x03a1, -}; - -const byte FONT2_DATA[] = { - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0xf0, 0xf0, 0xf0, - 0x00, 0xf0, 0x00, 0x06, 0xf3, 0xc0, 0xc3, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x07, 0x1c, 0x00, - 0x67, 0x9e, 0xc0, 0x07, 0x1c, 0x00, 0x67, 0x9e, 0xc0, 0x07, - 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x02, 0xc0, 0x00, 0x3f, - 0xfc, 0x00, 0xb2, 0xc0, 0x00, 0x3f, 0xfc, 0x00, 0x02, 0xcb, - 0x00, 0x3f, 0xfc, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x18, 0x60, - 0x70, 0x70, 0x60, 0x1c, 0x00, 0x04, 0x60, 0x18, 0x1c, 0x1c, - 0x1c, 0x70, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x30, - 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xc0, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf0, 0xf0, - 0x00, 0x07, 0x00, 0xf0, 0x03, 0xc0, 0x0f, 0x00, 0x3c, 0x00, - 0xf0, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xc0, 0x70, 0x70, 0x70, - 0x70, 0x70, 0x70, 0x3f, 0xc0, 0x00, 0x00, 0x07, 0x1f, 0x00, - 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0xff, 0xf0, 0x00, 0x00, - 0x08, 0x2b, 0xf0, 0xb0, 0x2c, 0x00, 0xa0, 0x0a, 0x00, 0xff, - 0xfc, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x70, 0x03, 0xc0, - 0x00, 0x70, 0xff, 0xc0, 0x00, 0x00, 0x07, 0x0b, 0xc0, 0x2d, - 0xc0, 0xb1, 0xc0, 0xaa, 0xa0, 0x01, 0xc0, 0x00, 0x00, 0x07, - 0xff, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x00, 0xb0, 0xbf, 0xc0, - 0x00, 0x00, 0x07, 0x2f, 0xc0, 0x70, 0x00, 0x7f, 0xc0, 0x70, - 0x70, 0x3f, 0xc0, 0x00, 0x00, 0x08, 0xff, 0xfc, 0x00, 0xb0, - 0x02, 0xc0, 0x02, 0xc0, 0x0b, 0x00, 0x00, 0x00, 0x08, 0x2f, - 0xf0, 0xb0, 0x1c, 0x2f, 0xf0, 0xb0, 0x1c, 0x2f, 0xf0, 0x00, - 0x00, 0x07, 0x3f, 0xc0, 0x70, 0x70, 0x3f, 0xf0, 0x00, 0x70, - 0x3f, 0xc0, 0x00, 0x00, 0x03, 0xf0, 0xf0, 0x00, 0xf0, 0xf0, - 0x00, 0x03, 0xf0, 0xf0, 0x00, 0xf0, 0x30, 0x00, 0x09, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, - 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x06, 0xff, 0x00, 0x03, 0xc0, 0x0f, 0x00, 0x3c, 0x00, - 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0a, 0x00, 0x40, 0x00, 0x01, 0xf0, 0x00, 0x07, 0x1c, - 0x00, 0x1f, 0xff, 0x00, 0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, - 0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xf0, 0x70, 0x1c, 0x6a, - 0xb0, 0x00, 0x00, 0x08, 0x2f, 0xfc, 0x70, 0x00, 0x70, 0x00, - 0x70, 0x00, 0x2a, 0xa8, 0x00, 0x00, 0x08, 0x7f, 0xf0, 0x70, - 0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x6a, 0xb0, 0x00, 0x00, 0x07, - 0x7f, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x70, 0x00, 0x6a, 0xa0, - 0x00, 0x00, 0x07, 0x7f, 0xf0, 0x70, 0x00, 0x7f, 0xc0, 0x70, - 0x00, 0x60, 0x00, 0x00, 0x00, 0x09, 0x3f, 0xfc, 0x00, 0x70, - 0x00, 0x00, 0x70, 0xff, 0x00, 0x70, 0x1c, 0x00, 0x2a, 0xbc, - 0x00, 0x00, 0x00, 0x00, 0x08, 0x70, 0x1c, 0x70, 0x1c, 0x7f, - 0xfc, 0x70, 0x1c, 0x70, 0x1c, 0x00, 0x00, 0x07, 0xff, 0xf0, - 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0xaa, 0xa0, 0x00, 0x00, - 0x08, 0x0f, 0xfc, 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x70, - 0x70, 0x2a, 0x40, 0x00, 0x00, 0x08, 0x70, 0x2c, 0x72, 0xc0, - 0x7f, 0x00, 0x72, 0xc0, 0x70, 0x28, 0x00, 0x00, 0x07, 0x70, - 0x00, 0x70, 0x00, 0x70, 0x00, 0x70, 0x00, 0x6a, 0xa0, 0x00, - 0x00, 0x0a, 0x70, 0x02, 0xc0, 0x7c, 0x09, 0xc0, 0x77, 0x2d, - 0xc0, 0x71, 0xb1, 0xc0, 0x60, 0xc1, 0x80, 0x00, 0x00, 0x00, - 0x09, 0x70, 0x07, 0x00, 0x77, 0x07, 0x00, 0x71, 0xc7, 0x00, - 0x70, 0x77, 0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x08, - 0x2f, 0xf0, 0x70, 0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x2a, 0xa0, - 0x00, 0x00, 0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xf0, 0x70, - 0x00, 0x60, 0x00, 0x00, 0x00, 0x08, 0x2f, 0xf0, 0x70, 0x1c, - 0x70, 0x1c, 0x71, 0xdc, 0x2a, 0xa0, 0x00, 0x1c, 0x00, 0x00, - 0x08, 0x7f, 0xf0, 0x70, 0x1c, 0x7f, 0xc0, 0x70, 0x70, 0x60, - 0x18, 0x00, 0x00, 0x07, 0x2f, 0xf0, 0x70, 0x00, 0x2f, 0xc0, - 0x00, 0xb0, 0xbf, 0xc0, 0x00, 0x00, 0x07, 0xff, 0xf0, 0x0b, - 0x00, 0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, - 0x70, 0x1c, 0x70, 0x1c, 0x70, 0x1c, 0x70, 0xdc, 0x1f, 0x1c, - 0x00, 0x00, 0x08, 0xf0, 0x1c, 0xb0, 0x1c, 0x70, 0xb0, 0x72, - 0xc0, 0x7f, 0x00, 0x00, 0x00, 0x0b, 0xf0, 0x00, 0xb0, 0xb0, - 0x00, 0x70, 0x70, 0xc0, 0x70, 0x72, 0x72, 0xc0, 0x7c, 0x1f, - 0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0x3c, 0x1c, 0xe0, 0x07, - 0xc0, 0x1c, 0x70, 0x70, 0x1c, 0x00, 0x00, 0x09, 0x70, 0x07, - 0x00, 0x1c, 0x1c, 0x00, 0x07, 0xf0, 0x00, 0x01, 0xc0, 0x00, - 0x01, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xfc, 0x00, - 0x70, 0x07, 0x00, 0x1c, 0x00, 0xaa, 0xac, 0x00, 0x00, 0x09, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -const int FONT6x6_INDEX[] = { - 62, 1, 6, - 0x0000, 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x002a, 0x0031, 0x0038, 0x003f, - 0x0046, 0x004d, 0x0054, 0x005b, 0x0062, 0x0069, 0x0070, 0x0077, 0x007e, 0x0085, - 0x008c, 0x0093, 0x009a, 0x00a1, 0x00a8, 0x00af, 0x00b6, 0x00bd, 0x00c4, 0x00cb, - 0x00d2, 0x00d9, 0x00e0, 0x00e7, 0x00ee, 0x00f5, 0x00fc, 0x0103, 0x010a, 0x0111, - 0x0118, 0x011f, 0x0126, 0x012d, 0x0134, 0x013b, 0x0142, 0x0149, 0x0150, 0x0157, - 0x015e, 0x0165, 0x016c, 0x0173, 0x017a, 0x0181, 0x0188, 0x018f, 0x0196, 0x019d, - 0x01a4, 0x01ab, -}; - -const byte FONT6x6_DATA[] = { - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x30, 0x30, - 0x30, 0x30, 0x00, 0x30, 0x06, 0xd8, 0xd8, 0x90, 0x00, 0x00, - 0x00, 0x06, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x00, 0x06, 0x78, - 0xa0, 0x70, 0x28, 0xf0, 0x20, 0x06, 0xc8, 0xd0, 0x20, 0x58, - 0x98, 0x00, 0x06, 0x60, 0xd0, 0x60, 0xe8, 0xd0, 0x68, 0x06, - 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x06, 0x30, 0x60, 0x60, - 0x60, 0x30, 0x00, 0x07, 0x30, 0x18, 0x18, 0x18, 0x30, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x20, 0x20, - 0xf8, 0x20, 0x20, 0x00, 0x06, 0x00, 0x00, 0x00, 0x30, 0x30, - 0x60, 0x06, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x06, 0x00, - 0x00, 0x00, 0x60, 0x60, 0x00, 0x06, 0x18, 0x30, 0x60, 0xc0, - 0x80, 0x00, 0x06, 0x70, 0x98, 0xa8, 0xc8, 0x70, 0x00, 0x06, - 0x10, 0x30, 0x10, 0x10, 0x10, 0x00, 0x06, 0xf0, 0x08, 0x70, - 0x80, 0xf8, 0x00, 0x06, 0xf0, 0x08, 0x70, 0x08, 0xf0, 0x00, - 0x06, 0x30, 0x50, 0x90, 0xf8, 0x10, 0x00, 0x06, 0xf0, 0x80, - 0xf0, 0x08, 0xf0, 0x00, 0x06, 0x70, 0x80, 0xf0, 0x88, 0x70, - 0x00, 0x06, 0xf8, 0x08, 0x10, 0x20, 0x20, 0x00, 0x06, 0x70, - 0x88, 0x70, 0x88, 0x70, 0x00, 0x06, 0x70, 0x88, 0x78, 0x08, - 0x70, 0x00, 0x06, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x06, - 0x60, 0x60, 0x00, 0x60, 0x20, 0x40, 0x06, 0x18, 0x30, 0x60, - 0x30, 0x18, 0x00, 0x06, 0x00, 0x78, 0x00, 0x78, 0x00, 0x00, - 0x06, 0x60, 0x30, 0x18, 0x30, 0x60, 0x00, 0x06, 0x70, 0x98, - 0x30, 0x30, 0x00, 0x30, 0x06, 0x70, 0x88, 0xb8, 0xb0, 0x80, - 0x78, 0x06, 0x70, 0x88, 0xf8, 0x88, 0x88, 0x00, 0x06, 0xf0, - 0x88, 0xf0, 0x88, 0xf0, 0x00, 0x06, 0x78, 0x80, 0x80, 0x80, - 0x78, 0x00, 0x06, 0xf0, 0x88, 0x88, 0x88, 0xf0, 0x00, 0x06, - 0xf8, 0x80, 0xf0, 0x80, 0xf8, 0x00, 0x06, 0xf8, 0x80, 0xf0, - 0x80, 0x80, 0x00, 0x06, 0x78, 0x80, 0x98, 0x88, 0x78, 0x00, - 0x06, 0x88, 0x88, 0xf8, 0x88, 0x88, 0x00, 0x06, 0x70, 0x20, - 0x20, 0x20, 0x70, 0x00, 0x06, 0x08, 0x08, 0x08, 0x88, 0x70, - 0x00, 0x06, 0x90, 0xa0, 0xc0, 0xa0, 0x90, 0x00, 0x06, 0x80, - 0x80, 0x80, 0x80, 0xf0, 0x00, 0x06, 0x88, 0xd8, 0xa8, 0x88, - 0x88, 0x00, 0x06, 0x88, 0xc8, 0xa8, 0x98, 0x88, 0x00, 0x06, - 0x70, 0x88, 0x88, 0x88, 0x70, 0x00, 0x06, 0xf0, 0x88, 0xf0, - 0x80, 0x80, 0x00, 0x06, 0x70, 0x88, 0x88, 0x88, 0x70, 0x18, - 0x06, 0xf0, 0x88, 0xf0, 0xa0, 0x98, 0x00, 0x06, 0x78, 0x80, - 0x70, 0x08, 0xf0, 0x00, 0x06, 0xf8, 0x20, 0x20, 0x20, 0x20, - 0x00, 0x06, 0x88, 0x88, 0x88, 0x88, 0x78, 0x00, 0x06, 0x88, - 0x88, 0x88, 0x50, 0x20, 0x00, 0x06, 0x88, 0x88, 0xa8, 0xd8, - 0x88, 0x00, 0x06, 0x88, 0x50, 0x20, 0x50, 0x88, 0x00, 0x06, - 0x88, 0x88, 0x50, 0x20, 0x20, 0x00, 0x06, 0xf8, 0x10, 0x20, - 0x40, 0xf8, 0x00, 0x06, 0x78, 0x60, 0x60, 0x60, 0x78, 0x00, - 0x06, 0xc0, 0x60, 0x30, 0x18, 0x08, 0x00, 0x06, 0x78, 0x18, - 0x18, 0x18, 0x78, 0x00, 0x00, 0x52, 0x41, 0x54, 0x00, 0x41, - 0x4c, 0x43, 0x4f, 0x48, 0x4f, 0x4c, 0x00, 0x53, 0x41, 0x46, - 0x45, 0x20, 0x43, 0x4f, 0x4d, 0x42, 0x49, 0x4e, 0x41, 0x54, - 0x49, 0x4f, 0x4e, 0x00, 0x42, 0x45, 0x41, 0x4b, 0x45, 0x52, - 0x00, 0x4d, 0x49, 0x43, 0x52, 0x4f, 0x46, 0x49, 0x4c, 0x4d, - 0x00, 0x56, 0x41, 0x55, 0x4c, 0x54, 0x20, 0x4b, 0x45, 0x59, - 0x00, 0x42, 0x4f, 0x4c, 0x54, 0x20, 0x43, 0x55, 0x54, 0x54, - 0x45, 0x52, 0x53, 0x00, 0x42, 0x4c, 0x4f, 0x57, 0x47, 0x55, - 0x4e, 0x00, 0x4c, 0x4f, 0x56, 0x45, 0x20, 0x50, 0x4f, 0x54, - 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x4e, 0x45, 0x59, 0x00, - 0x44, 0x41, 0x52, 0x54, 0x53, 0x00, 0x54, 0x41, 0x50, 0x45, - 0x00, 0x4a, 0x55, 0x4e, 0x47, 0x4c, 0x45, 0x20, 0x50, 0x4f, - 0x54, 0x49, 0x4f, 0x4e, 0x00, 0x4d, 0x4f, 0x56, 0x49, -}; - -const char *const NO_HELP_MESSAGE = - "WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS. YOUR IQ \ -HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \ -YOU CAN UNDERSTAND."; -const char *const NO_HINTS_MESSAGE = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME."; -const char *const RIVER_HIT1 = "YOU HIT THE ROCKS AND THE CANOE BEGINS TO LEAK."; -const char *const RIVER_HIT2 = "YOU HIT THE ROCKS AND THE CANOE DEVELOPS SERIOUS LEAKS."; -const char *const BAR_MESSAGE = "YOU ARE TOO BUSY TRYING TO KEEP FROM SINKING TO DO THAT"; -const char *const HELPLVLTXT[3] = { - " LEVEL 1 ", - " LEVEL 2 ", - " LEVEL 3 " -}; - -const char *const IQLABELS[9] = { - "VEGETABLE", - "NEANDERTHAL", - "LOBOTOMIZED", - "DENSE", - "AVERAGE", - "INTELLIGENT", - "MURPHYITE", - "BRILLIANT", - "GENIUS" -}; - -const byte DEATH_SCREENS[58] = { - 0, 1, 0, 0, 0, 0, 0, 0, 2, 0, - 0, 2, 4, 2, 1, 0, 0, 0, 0, 0, - 0, 2, 7, 7, 4, 6, 7, 10, 4, 2, - 0, 0, 0, 0, 5, 5, 3, 3, 3, 5, - 8, 8, 11, 9, 8, 12, 0, 1, 9, 8, - 8, 0, 5, 8, 0, 12, 12, 11 -}; - -const byte DEATH_SCREENS_DEMO[34] = { - 1, 2, 1, 1, 1, 1, 1, 1, 4, 1, - 3, 4, 2, 4, 2, 1, 1, 1, 1, 1, - 1, 4, 2, 4, 2, 4, 2, 4, 4, 4, - 1, 1, 1, 1 -}; - -const char *const DEATH_TEXT[58] = { - "SAM SALVADOR SPOTS YOU AND LETS YOU HAVE IT.", - "WHILE TAKING A MOONLIGHT SWIM YOU DISCOVER THAT PIRANHA REALLY CAN STRIP FLESH TO THE BONE.", - "THE GUARD FILLS YOU FULL OF HOLES BEFORE TOSSING YOU TO THE PIRANHA.", - "YOU'RE ONLY ABLE TO SWIM HALFWAY ACROSS THE RIVER BEFORE RUNNING OUT OF AIR. " - "YOU MAKE SO MUCH NOISE GASPING FOR BREATH THAT SAM EASILY FINDS YOU AND LEAVES " - "YOU IN THE RIVER PERMANENTLY.", - "SAM SALVADOR NOTICES SOMEONE HAS BEEN PLAYING WITH THE CARGO. " - "HE TRACKS YOU DOWN AND LETS YOU HAVE IT.", - "THE GUARD COMES AROUND THE CORNER. HE DECIDES THAT THREE LEAD SLUGS WILL " - "TEACH YOU TO BE MORE POLITE.", - "THE CAPTAIN IS WAITING OUTSIDE THE DOOR.", - "THE CAPTAIN'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.", - "THE CRATE OUTSIDE THE WINDOW EXPLODES, DESTROYING THE SHIP. " - "UNFORTUNATELY, YOU'RE STILL ABOARD.", - "THE DOOR WAS NOT BARRED AND THE CAPTAIN WALKS RIGHT IN AND PARTS YOUR HAIR.", - - "", - "YOU RUN OUT ON DECK, THEN REALIZE THAT MAYA IS STILL TIED UP. " - "AS YOU TURN TO GO BACK THE BOAT BLOWS UP.", - "AFTER YOU FAIL TO PROVE YOUR DIVINITY THE NATIVES EAT YOU FOR LUNCH.", - "THIS IS THE GENERIC DEATH SCENE", - "YOU ONLY MAKE IT HALFWAY ACROSS THE RIVER BEFORE THE PIRANHA STRIKE.", - "WITH NOTHING TO PROTECT HIM FROM THE HAIL OF BULLETS ALLEN IS QUICKLY GUNNED DOWN. " - "JASON AND MAYA SOON FOLLOW...", - "THE COMBINATION OF THE WIND AND GUNFIRE KNOCK THE CORRUGATED IRON OVER, " - "LEAVING YOU WITHOUT PROTECTION.", - "WITHOUT SUFFICIENT AMMUNITION, ALLEN IS UNABLE TO HOLD OFF THE ATTACKERS FOR LONG. " - "THIS RESULTS IN A SERIOUS CASE OF LEAD POISONING. ADDITIONAL AMMUNITION SHOULD " - "HAVE BEEN PURCHASED AT THE RIO BLANCO TRADING POST (CHAPTER 6).", - "ALLEN IS A MARVELOUS SHOT, BUT HIS AMMUNITION IS NOT UNLIMITED. " - "SOON IT IS ALL OVER.", - "THE PILOT FEELS YOU ARE TOO CLOSE AND PULLS THE TRIGGER.", - - "THE PILOT SHOOTS YOU IN THE HEART, THEN TOSSES YOUR LIFELESS BODY OUT THE DOOR.", - "THE PLANE CRASHES INTO THE JUNGLE CANOPY AT 200 MPH.", - "THE CANOE HITS THE ROCKS AND CAPSIZES, AND THE PIRANHA MAKE YOU THEIR LUNCH GUESTS.", - "YOU TAKE THE WRONG BRANCH AND ACCIDENTALLY DISCOVER THE FOURTH TALLEST WATERFALL " - "IN SOUTH AMERICA.", - "YOU TAKE THE WRONG BRANCH AND DISCOVER A VERY HUNGRY TRIBE OF CANNIBALS.", - "YOU TAKE THE WRONG BRANCH AND BECOME LOST IN THE WINDING WATERWAYS. " - "YOU WANDER UNTIL YOU STARVE TO DEATH.", - "YOU TAKE THE WRONG BRANCH AND BECOME TRAPPED IN THE RAPIDS. " - "EVENTUALLY YOU AND MAYA ARE CRUSHED BETWEEN THE ROCKS.", - "YOU WAIT AROUND FOR SOME TIME, BUT HANS STROHEIM NEVER SPEAKS TO YOU AGAIN. " - "FINALLY YOU RETURN HOME KNOWING YOU HAVE FAILED.", - "DECIDING THAT YOU THREATEN HIM AND HIS WORK, HANS STROHEIM HAS THE NATIVES " - "IN THE VILLAGE KILL YOU.", - "YOU DO NOT GET FAR ENOUGH AWAY BEFORE THE DYNAMITE EXPLODES AND YOU ARE BLOWN " - "INTO A THOUSAND PIECES.", - - "YOU ARE STANDING SO CLOSE TO THE ENTRANCE WHEN SANCEZ AND HIS MEN BREAK THROUGH " - "THE WALL THAT YOU ARE QUICKLY SPOTTED AND SHOT", - "THE AMAZON SENTINELS SPOT YOU AND FILL YOU FULL OF ARROWS.", - "SAM MAY BE UGLY, BUT HE'S NOT DEAF. HE HEARS ALL THE NOISE YOU ARE MAKING AND " - "CANCELS YOUR BOARDING PASS.", - "WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY", - "THE BEAR WANDERS OFF INTO THE WOODS AND DISTURBS THE TWO LOVEBIRDS. " - "WHEN THEY COME OUT THEY FIND YOU AND PUT YOU IN THE BIG HOUSE FOR TWENTY YEARS.", - "WHEN YOU DO NOT LEAVE THE SECURITY AREA QUICKLY ENOUGH YOU ARE ARRESTED AND CONVICTED " - "AS A COMMIE SPY. YOU EMBARK ON A NEW CAREER STAMPING OUT LICENSE PLATES.", - "THE HUNGRY BEAR SPOTS YOU AND DECIDES YOU WILL MAKE A NICE APPETIZER.", - "YOU DISTURB THE BEAR'S LUNCH AND HE EATS YOU FOR DESSERT.", - "AFTER FAILING TO FIND ANY LUNCH AT THE GARBAGE CAN THE BEAR EATS YOU INSTEAD.", - "THE SUSPICIOUS LIBRARIAN CALLS SECURITY AND YOU ARE SENT TO JAIL.", - - "YOU PLUMMET 10,000 FEET TO YOUR DEATH.", - "EL LOCO FLIES INTO AN INSANE RAGE AND BEATS YOU TO A BLOODY PULP.", - "THE WOMAN WALKS OUT THE DOOR AND NEVER RETURNS. YOU SPEND THE REST OF YOUR LIFE " - "IN A FUTILE ATTEMPT TO LOCATE ALLEN.", - "YOU SLIP OFF THE PLATFORM AND FALL TO YOUR DEATH.", - "YOU SLIP OFF THE PLATFORM AND FALL TO YOUR DEATH.", - "YOU COME TOO CLOSE TO THE POWERFUL JAWS OF THE ANT AND HE SNIPS YOU IN TWO BEFORE " - "DEVOURING YOU.", - "B.O.B. HAS A FLAW IN HIS PROGRAMMING THAT DIRECTS HIM TO SHOOT FIRST AND ASK QUESTIONS LATER.", - "THE PLANE SINKS AND THE PIRHANA ATTACK BEFORE YOU EVEN GET OUT THE DOOR.", - "MAYA FALLS OFF THE END OF THE BROKEN BRIDGE.", - "YOUR WEIGHT IS JUST ENOUGH TO CAUSE THE REMAINING SUPPORT CABLE TO SNAP AND YOU " - "FALL TO THE BOTTOM OF THE GORGE.", - - "EVEN WITH REPAIRS THE BRIDGE IS NOT STRONG ENOUGH TO HOLD TWO PEOPLE.", - "SANCHEZ AND HIS MEN FIND YOU AND HOLD FIRING SQUAD PRACTICE.", - "THE TWO GUARDS ARE DISTURBED IN THEIR LOVE NEST AND COME LOOKING FOR ANYONE ACTING SUSPICIOUS. " - "THEY FIND YOU AND SEND YOU UP THE RIVER.", - "THE PARACHUTE IS NOT LARGE ENOUGH TO SUPPORT YOU, AND YOU HIT THE TREES AT 140 M.P.H.", - "SANCHEZ AND HIS MEN FOLLOW YOU ACROSS THE BRIDGE AND CUT YOU DOWN IN A HAIL OF GUNFIRE", - "YOU TRIED TO STAB THE ANT BUT HIS SHELL IS TOO DIFFICULT TO PENETRATE. " - "YOU NOTICE A SLIGHT CUT IN THE SHELL UNDERNEATH BUT YOU CAN'T GET TO IT " - "AND HE SNIPS YOU INTO DELICIOUS MEATY CHUNKS.", - "AFTER THE ANT FINISHES SUCKING ALL OF THE SAP OUT OF THE VINE HE TURNS HIS ATTENTION BACK TO YOU " - "AND BITES YOUR HEAD OFF.", - "THE CANTINA OWNER NOTICES YOU ARE TRYING TO STEAL OBJECTS FROM THE TABLES. " - "TWENTY YEARS LATER YOU ARE RELEASED FROM A SOUTH AMERICAN PRISON." -}; - -const char *const DEATH_TEXT_DEMO[34] = { - "SAM SALVADOR SPOTS YOU AND LETS YOU HAVE IT.", - "WHILE TAKING A MOONLIGHT SWIM YOU DISCOVER THAT PIRANHA REALLY CAN STRIP FLESH TO THE BONE.", - "THE GUARD FILLS YOU FULL OF HOLES BEFORE TOSSING YOU TO THE PIRANHA.", - "YOU'RE ONLY ABLE TO SWIM HALFWAY ACROSS THE RIVER BEFORE RUNNING OUT OF AIR. YOU MAKE SO MUCH NOISE GASPING FOR BREATH THAT SAM EASILY FINDS YOU AND LEAVES YOU IN THE RIVER PERMANENTLY.", - "SAM SALVADOR NOTICES SOMEONE HAS BEEN PLAYING WITH THE CARGO. HE TRACKS YOU DOWN AND LETS YOU HAVE IT.", - "THE GUARD COMES AROUND THE CORNER. HE DECIDES THAT THREE LEAD SLUGS WILL TEACH YOU TO BE MORE POLITE.", - "THE CAPTAIN IS WAITING OUTSIDE THE DOOR.", - "THE CAPTAIN'S RANDOM SHOOTING FINALLY FINDS ITS TARGET.", - "THE CRATE OUTSIDE THE WINDOW EXPLODES, DESTROYING THE SHIP. UNFORTUNATELY, YOU'RE STILL ABOARD.", - "THE DOOR WAS NOT BARRED AND THE CAPTAIN WALKS RIGHT IN AND PARTS YOUR HAIR.", - "", - "YOU RUN OUT ON DECK, THEN REALIZE THAT MAYA IS STILL TIED UP. AS YOU TURN TO GO BACK THE BOAT BLOWS UP.", - "AFTER YOU FAIL TO PROVE YOUR DIVINITY THE NATIVES EAT YOU FOR LUNCH.", - "THIS IS THE GENERIC DEATH SCENE", - "YOU ONLY MAKE IT HALFWAY ACROSS THE RIVER BEFORE THE PIRANHA STRIKE.", - "WITH NOTHING TO PROTECT HIM FROM THE HAIL OF BULLETS ALLEN IS QUICKLY GUNNED DOWN. JASON AND MAYA SOON FOLLOW...", - "THE COMBINATION OF THE WIND AND GUNFIRE KNOCK THE CORRUGATED IRON OVER, LEAVING YOU WITHOUT PROTECTION.", - "WITHOUT SUFFICIENT AMMUNITION, ALLEN IS UNABLE TO HOLD OFF THE ATTACKERS FOR LONG. THIS RESULTS IN A SERIOUS CASE OF LEAD POISONING.", - "ALLEN IS A MARVELOUS SHOT, BUT HIS AMMUNITION IS NOT UNLIMITED. SOON IT IS ALL OVER.", - "THE PILOT FEELS YOU ARE TOO CLOSE AND PULLS THE TRIGGER.", - "THE PILOT SHOOTS YOU IN THE HEAD, THEN TOSSES YOUR LIFELESS", - "THE PLANE CRASHES INTO THE JUNGLE CANOPY AT 200 MPH.", - "THE CANOE HITS THE ROCKS AND CAPSIZES, AND THE PIRANHA MAKE YOU THEIR LUNCH GUESTS.", - "YOU ACCIDENTALLY DISCOVER THE FOURTH TALLEST WATERFALL IN SOUTH AMERICA.", - "YOU DISCOVER A VERY HUNGRY TRIBE OF CANNIBALS.", - "YOU BECOME LOST IN THE WINDING WATERWAYS AND WANDER UNTIL YOU STARVE TO DEATH.", - "YOU BECOME TRAPPED IN THE RAPIDS AND ARE CRUSHED BETWEEN THE ROCKS.", - "YOU WAIT AROUND FOR SOME TIME, BUT HANS STROHEIM NEVER SPEAKS TO YOU AGAIN. FINALLY YOU RETURN HOME KNOWING YOU HAVE FAILED.", - "DECIDING THAT YOU THREATEN HIM AND HIS WORK, HANS STROHEIM HAS THE NATIVES IN THE VILLAGE KILL YOU.", - "YOU DO NOT GET FAR ENOUGH AWAY BEFORE THE DYNAMITE EXPLODES AND YOU ARE BLOWN INTO A THOUSAND PIECES.", - "STANDING OUT IN THE OPEN YOU ARE EXPOSED TO THE HAIL OF BULLETS FROM SANCHEZ' MEN.", - "THE AMAZON SENTINELS SPOT YOU AND FILL YOU FULL OF ARROWS.", - "SAM MAY BE UGLY, BUT HE'S NOT DEAF. HE HEARS ALL THE NOISE YOU ARE MAKING AND CANCELS YOUR BOARDING PASS.", - "WITH THE BAR OFF THE DOOR THE CAPTAIN WALTZES IN AND BLOWS YOU AWAY" -}; - const int DEATH_CELLS[13][3] = { { 0, 94, 2 }, { 0, 94, 3 }, @@ -1984,94 +165,6 @@ const int CHAPTER_JUMP[14] = { 0, 12, 10, 15, 19, 25, 31, 36, 45, 46, 29, 55, 61, 0 }; -const int COMBO_TABLE[85][4] = { - { -1, -1, -1, -1 }, - { 12, 3, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 24, 25, -1, -1 }, - { 10, 24, -1, -1 }, - { -1, -1, -1, -1 }, - { 8, 24, -1, -1 }, - { -1, -1, -1, -1 }, - { 1, 3, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 7, 25, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 80, 81, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 41, 42, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 39, 40, -1, -1 }, - { 38, 40, -1, -1 }, - { -1, -1, -1, -1 }, - { 32, 42, 77, 78 }, - { -1, -1, -1, -1 }, - { 60, 61, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 73, 72, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 64, 67, -1, -1 }, - { -1, -1, -1, -1 }, - { 59, 60, -1, -1 }, - { 58, 60, -1, -1 }, - { 43, 61, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 56, 67, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 50, 72, -1, -1 }, - { 75, 77, -1, -1 }, - { 74, 77, -1, -1 }, - { -1, -1, -1, -1 }, - { 41, 78, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { 29, 81, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 }, - { -1, -1, -1, -1 } -}; - const int ANTWALK[24] = { 0, 3, 0, 1, 5, 0, diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h index 10dea02abc..ca0bfeb5b7 100644 --- a/engines/access/amazon/amazon_resources.h +++ b/engines/access/amazon/amazon_resources.h @@ -24,6 +24,8 @@ #define ACCESS_AMAZON_RESOURCES_H #include "common/scummsys.h" +#include "common/array.h" +#include "access/resources.h" namespace Access { @@ -42,9 +44,6 @@ struct RiverStruct { int _offsetY; }; -extern const char *const FILENAMES[]; -extern const char *const FILENAMES_DEMO[]; - extern const int SIDEOFFR[]; extern const int SIDEOFFL[]; extern const int SIDEOFFU[]; @@ -58,8 +57,6 @@ extern const int DIAGOFFULY[]; extern const int DIAGOFFDLX[]; extern const int DIAGOFFDLY[]; -extern const byte *const CURSORS[10]; - extern const int _travelPos[][2]; extern const int OVEROFFR[]; @@ -75,37 +72,6 @@ extern const int OVEROFFULY[]; extern const int OVEROFFDLX[]; extern const int OVEROFFDLY[]; -extern const byte *const ROOM_TABLE[]; -extern const char *const ROOM_DESCR[]; -extern const byte *const ROOM_TABLE_DEMO[]; -extern const int ROOM_NUMB; - -extern const byte *const CHARTBL[]; -extern const byte *const CHARTBL_DEMO[]; - -extern const char *const INVENTORY_NAMES[]; - -extern const int FONT2_INDEX[]; - -extern const byte FONT2_DATA[]; - -extern const int FONT6x6_INDEX[]; - -extern const byte FONT6x6_DATA[]; - -extern const char *const NO_HELP_MESSAGE; -extern const char *const NO_HINTS_MESSAGE; -extern const char *const RIVER_HIT1; -extern const char *const RIVER_HIT2; -extern const char *const BAR_MESSAGE; -extern const char *const HELPLVLTXT[3]; -extern const char *const IQLABELS[9]; -extern const byte DEATH_SCREENS[58]; -extern const byte DEATH_SCREENS_DEMO[34]; - -extern const char *const DEATH_TEXT[58]; -extern const char *const DEATH_TEXT_DEMO[34]; - extern const int DEATH_CELLS[13][3]; extern const int CHAPTER_CELLS[17][3]; @@ -155,6 +121,30 @@ extern const int CAST_END_OBJ1[4][4]; extern const int RMOUSE[10][2]; +class AmazonResources: public Resources { +protected: + /** + * Load data from the access.dat file + */ + virtual void load(Common::SeekableReadStream &s); +public: + Common::Array FONT2_INDEX; + Common::Array FONT2_DATA; + Common::Array FONT6x6_INDEX; + Common::Array FONT6x6_DATA; + Common::String NO_HELP_MESSAGE; + Common::String NO_HINTS_MESSAGE; + Common::String RIVER_HIT1; + Common::String RIVER_HIT2; + Common::String BAR_MESSAGE; + Common::String HELPLVLTXT[3]; + Common::String IQLABELS[9]; +public: + AmazonResources(AccessEngine *vm); +}; + +#define AMRES (*((Amazon::AmazonResources *)_vm->_res)) + } // End of namespace Amazon } // End of namespace Access diff --git a/engines/access/amazon/amazon_room.cpp b/engines/access/amazon/amazon_room.cpp index 29742f66bd..c027f4e7c6 100644 --- a/engines/access/amazon/amazon_room.cpp +++ b/engines/access/amazon/amazon_room.cpp @@ -41,10 +41,7 @@ AmazonRoom::~AmazonRoom() { } void AmazonRoom::loadRoom(int roomNumber) { - if (_vm->isDemo()) - loadRoomData(ROOM_TABLE_DEMO[roomNumber]); - else - loadRoomData(ROOM_TABLE[roomNumber]); + loadRoomData(&AMRES.ROOMTBL[roomNumber]._data[0]); } void AmazonRoom::reloadRoom() { diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index d8f4663401..9ff6a2952d 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -401,10 +401,10 @@ void AmazonScripts::cmdHelp_v2() { _game->_useItem = 0; if (_game->_noHints) { - printString(NO_HELP_MESSAGE); + printString(AMRES.NO_HELP_MESSAGE); return; } else if (_game->_hintLevel == 0) { - printString(NO_HINTS_MESSAGE); + printString(AMRES.NO_HINTS_MESSAGE); return; } } diff --git a/engines/access/char.cpp b/engines/access/char.cpp index aca7262952..76dfca6df0 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -78,25 +78,12 @@ CharEntry::CharEntry() { /*------------------------------------------------------------------------*/ CharManager::CharManager(AccessEngine *vm) : Manager(vm) { - switch (vm->getGameID()) { - case GType_Amazon: - // Setup character list - if (_vm->isDemo()) { - for (int i = 0; i < 27; ++i) - _charTable.push_back(CharEntry(Amazon::CHARTBL_DEMO[i], vm)); - } else { - for (int i = 0; i < 37; ++i) - _charTable.push_back(CharEntry(Amazon::CHARTBL[i], vm)); - } - break; - - case GType_MartianMemorandum: - for (int i = 0; i < 27; ++i) - _charTable.push_back(CharEntry(Martian::CHARTBL_MM[i], vm)); - break; - - default: - error("Unknown game"); + // Setup character list + for (uint idx = 0; idx < _vm->_res->CHARTBL.size(); ++idx) { + if (_vm->_res->CHARTBL[idx].size() == 0) + _charTable.push_back(CharEntry()); + else + _charTable.push_back(CharEntry(&_vm->_res->CHARTBL[idx][0], _vm)); } _charFlag = 0; diff --git a/engines/access/debugger.cpp b/engines/access/debugger.cpp index bc61b0a749..48c7290249 100644 --- a/engines/access/debugger.cpp +++ b/engines/access/debugger.cpp @@ -69,29 +69,9 @@ Debugger::Debugger(AccessEngine *vm) : GUI::Debugger(), _vm(vm) { registerCmd("scene", WRAP_METHOD(Debugger, Cmd_LoadScene)); registerCmd("cheat", WRAP_METHOD(Debugger, Cmd_Cheat)); registerCmd("playmovie", WRAP_METHOD(Debugger, Cmd_PlayMovie)); - - switch (vm->getGameID()) { - case GType_Amazon: - _sceneNumb = Amazon::ROOM_NUMB; - _sceneDescr = new Common::String[_sceneNumb]; - for (int i = 0; i < _sceneNumb; i++) - _sceneDescr[i] = Common::String(Amazon::ROOM_DESCR[i]); - break; - case GType_MartianMemorandum: - _sceneNumb = Martian::ROOM_NUMB; - _sceneDescr = new Common::String[_sceneNumb]; - for (int i = 0; i < _sceneNumb; i++) - _sceneDescr[i] = Common::String(Martian::ROOM_DESCR[i]); - break; - default: - _sceneDescr = nullptr; - _sceneNumb = 0; - break; - } } Debugger::~Debugger() { - delete[] _sceneDescr; } bool Debugger::Cmd_LoadScene(int argc, const char **argv) { @@ -99,18 +79,18 @@ bool Debugger::Cmd_LoadScene(int argc, const char **argv) { case 1: debugPrintf("Current scene is: %d\n\n", _vm->_player->_roomNumber); - for (int i = 0; i < _sceneNumb; i++) - if (_sceneDescr[i].size()) - debugPrintf("%d - %s\n", i, _sceneDescr[i].c_str()); + for (uint i = 0; i < _vm->_res->ROOMTBL.size(); i++) + if (!_vm->_res->ROOMTBL[i]._desc.empty()) + debugPrintf("%d - %s\n", i, _vm->_res->ROOMTBL[i]._desc.c_str()); return true; case 2: { int newRoom = strToInt(argv[1]); - if (newRoom < 0 || newRoom >= _sceneNumb) { + if (newRoom < 0 || newRoom >= (int)_vm->_res->ROOMTBL.size()) { debugPrintf("Invalid Room Number\n"); return true; } - if (!_sceneDescr[newRoom].size()) { + if (_vm->_res->ROOMTBL[newRoom]._desc.empty()) { debugPrintf("Unused Room Number\n"); return true; } diff --git a/engines/access/debugger.h b/engines/access/debugger.h index 1c1e00327c..641b85c19b 100644 --- a/engines/access/debugger.h +++ b/engines/access/debugger.h @@ -40,8 +40,6 @@ protected: bool Cmd_LoadScene(int argc, const char **argv); bool Cmd_Cheat(int argc, const char **argv); bool Cmd_PlayMovie(int argc, const char **argv); - Common::String *_sceneDescr; - int _sceneNumb; public: static Debugger *init(AccessEngine *vm); void postEnter(); diff --git a/engines/access/events.cpp b/engines/access/events.cpp index 6ffe67acfb..d62b05c33f 100644 --- a/engines/access/events.cpp +++ b/engines/access/events.cpp @@ -74,7 +74,7 @@ void EventsManager::setCursor(CursorType cursorId) { _invCursor.w / 2, _invCursor.h / 2, 0); } else { // Get a pointer to the mouse data to use, and get the cursor hotspot - const byte *srcP = Amazon::CURSORS[cursorId]; + const byte *srcP = &_vm->_res->CURSORS[cursorId][0]; int hotspotX = (int16)READ_LE_UINT16(srcP); int hotspotY = (int16)READ_LE_UINT16(srcP + 2); srcP += 4; diff --git a/engines/access/files.cpp b/engines/access/files.cpp index 4d734a67a9..b9c0f7080d 100644 --- a/engines/access/files.cpp +++ b/engines/access/files.cpp @@ -84,20 +84,6 @@ byte *Resource::data() { /*------------------------------------------------------------------------*/ FileManager::FileManager(AccessEngine *vm) : _vm(vm) { - switch (vm->getGameID()) { - case GType_Amazon: - if (_vm->isDemo()) - _filenames = &Amazon::FILENAMES_DEMO[0]; - else - _filenames = &Amazon::FILENAMES[0]; - break; - case GType_MartianMemorandum: - _filenames = &Martian::FILENAMES[0]; - break; - default: - error("Unknown game"); - } - _fileNumber = -1; _setPaletteFlag = true; } @@ -215,8 +201,8 @@ void FileManager::handleFile(Resource *res) { void FileManager::setAppended(Resource *res, int fileNum) { // Open the file for access - if (!res->_file.open(_filenames[fileNum])) - error("Could not open file %s", _filenames[fileNum]); + if (!res->_file.open(_vm->_res->FILENAMES[fileNum])) + error("Could not open file %s", _vm->_res->FILENAMES[fileNum].c_str()); // If a different file has been opened then previously, load its index if (_fileNumber != fileNum) { diff --git a/engines/access/files.h b/engines/access/files.h index 714ea44c75..d081934e91 100644 --- a/engines/access/files.h +++ b/engines/access/files.h @@ -70,7 +70,6 @@ public: class FileManager { private: AccessEngine *_vm; - const char * const *_filenames; void openFile(Resource *res, const Common::String &filename); diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp index 3823b17283..d4a869be28 100644 --- a/engines/access/inventory.cpp +++ b/engines/access/inventory.cpp @@ -66,27 +66,9 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) { _iconDisplayFlag = true; _boxNum = 0; - const char *const *names; - const int *combineP; - - switch (vm->getGameID()) { - case GType_Amazon: - names = Amazon::INVENTORY_NAMES; - combineP = &Amazon::COMBO_TABLE[0][0]; - _inv.resize(85); - for (uint i = 0; i < _inv.size(); ++i, combineP += 4) - _inv[i].load(names[i], combineP); - break; - case GType_MartianMemorandum: - names = Martian::INVENTORY_NAMES; - combineP = nullptr; - _inv.resize(55); - for (uint i = 0; i < _inv.size(); ++i) - _inv[i].load(names[i], nullptr); - break; - default: - error("Unknown game"); - } + _inv.resize(_vm->_res->INVENTORY.size()); + for (uint idx = 0; idx < _inv.size(); ++idx) + _inv[idx].load(_vm->_res->INVENTORY[idx]._desc, _vm->_res->INVENTORY[idx]._combo); for (uint i = 0; i < 26; ++i) { const int *r = INVCOORDS[i]; @@ -217,12 +199,15 @@ int InventoryManager::newDisplayInv() { } int InventoryManager::displayInv() { - int *inv = (int *) malloc (Martian::INVENTORY_SIZE * sizeof(int)); + int *inv = (int *) malloc(_vm->_res->INVENTORY.size() * sizeof(int)); + const char **names = (const char **)malloc(_vm->_res->INVENTORY.size() * sizeof(const char *)); - for (int i = 0; i < Martian::INVENTORY_SIZE; i++) + for (uint i = 0; i < _vm->_res->INVENTORY.size(); i++) { inv[i] = _inv[i]._value; + names[i] = _inv[i]._name.c_str(); + } _vm->_events->forceSetCursor(CURSOR_CROSSHAIRS); - _vm->_invBox->getList(Martian::INVENTORY_NAMES, inv); + _vm->_invBox->getList(names, inv); int btnSelected = 0; int boxX = _vm->_invBox->doBox_v1(_startInvItem, _startInvBox, btnSelected); diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp index 3fdba8d260..4e858568fe 100644 --- a/engines/access/martian/martian_game.cpp +++ b/engines/access/martian/martian_game.cpp @@ -68,8 +68,8 @@ void MartianEngine::initVariables() { _timers.push_back(te); } - _player->_playerX = _player->_rawPlayer.x = _travelPos[_player->_roomNumber][0]; - _player->_playerY = _player->_rawPlayer.y = _travelPos[_player->_roomNumber][1]; + _player->_playerX = _player->_rawPlayer.x = _res->ROOMTBL[_player->_roomNumber]._travelPos.x; + _player->_playerY = _player->_rawPlayer.y = _res->ROOMTBL[_player->_roomNumber]._travelPos.y; _room->_selectCommand = -1; _events->setNormalCursor(CURSOR_CROSSHAIRS); _mouseMode = 0; @@ -280,10 +280,10 @@ void MartianEngine::doCredits() { void MartianEngine::setupGame() { // Load death list - _deaths.resize(20); - for (int i = 0; i < 20; ++i) { - _deaths[i]._screenId = Martian::DEATH_SCREENS[i]; - _deaths[i]._msg = Martian::DEATHMESSAGE[i]; + _deaths.resize(_res->DEATHS.size()); + for (uint idx = 0; idx < _deaths.size(); ++idx) { + _deaths[idx]._screenId = _res->DEATHS[idx]._screenId; + _deaths[idx]._msg = _res->DEATHS[idx]._msg; } // Setup timers @@ -297,14 +297,14 @@ void MartianEngine::setupGame() { } // Miscellaneous - // TODO: Replace with Martian fonts when located - _fonts._font1.load(Amazon::FONT6x6_INDEX, Amazon::FONT6x6_DATA); - _fonts._font2.load(Amazon::FONT2_INDEX, Amazon::FONT2_DATA); + Amazon::AmazonResources &res = *((Amazon::AmazonResources *)_res); + _fonts._font1.load(&res.FONT6x6_INDEX[0], &res.FONT6x6_DATA[0]); + _fonts._font2.load(&res.FONT2_INDEX[0], &res.FONT2_DATA[0]); // Set player room and position _player->_roomNumber = 7; - _player->_playerX = _player->_rawPlayer.x = _travelPos[_player->_roomNumber][0]; - _player->_playerY = _player->_rawPlayer.y = _travelPos[_player->_roomNumber][1]; + _player->_playerX = _player->_rawPlayer.x = _res->ROOMTBL[_player->_roomNumber]._travelPos.x; + _player->_playerY = _player->_rawPlayer.y = _res->ROOMTBL[_player->_roomNumber]._travelPos.y; } void MartianEngine::showDeathText(Common::String msg) { diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp index 474ec2f71c..dc75b83379 100644 --- a/engines/access/martian/martian_resources.cpp +++ b/engines/access/martian/martian_resources.cpp @@ -27,690 +27,10 @@ namespace Access { namespace Martian { -const char *const FILENAMES[] = { - "R00.AP", "R01.AP", "R02.AP", "R03.AP", "R04.AP", "R05.AP", "R06.AP", "R07.AP", - "R08.AP", "R09.AP", "R10.AP", "R11.AP", "R12.AP", "R13.AP", "R14.AP", "R15.AP", - "R16.AP", "R17.AP", "R18.AP", "R19.AP", "R20.AP", "R21.AP", "R22.AP", "R23.AP", - "R24.AP", "R25.AP", "R26.AP", "R27.AP", "R28.AP", "R29.AP", "R30.AP", "R31.AP", - "R32.AP", "R33.AP", "R34.AP", "R35.AP", "R36.AP", "R37.AP", "R38.AP", "R39.AP", - "R40.AP","TITLE.AP","R42.AP","S01.AP", "R44.AP", "R45.AP","SOUND.AP","MUSIC.AP", - "DEAD.AP","EST.AP", "W02.AP", "C02.AP", "C05.AP", "C04.AP", "C10.AP", "C03.AP", - "C07.AP", "LOVE.AP","CAFE.AP","C08.AP", "C18.AP", "C19.AP", "C21.AP", "C23.AP", - "C12.AP", "C16.AP","CAFE1.AP","C05A.AP","C06.AP","C11.AP", "C13.AP", "C20.AP", - "C16A.AP","C09.AP", "R45.AP", "R46.AP", "R47.AP", "R48.AP", "R49.AP" -}; - -const byte MOUSE0[] = { - // hotspot x and y, uint16 LE - 0, 0, 0, 0, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0, 2, 0xF7, 5, - 0, 3, 0xF7, 0xF7, 5, - 0, 3, 0xF7, 0xF7, 5, - 0, 4, 0xF7, 0xF7, 0xF7, 5, - 0, 4, 0xF7, 0xF7, 0xF7, 5, - 0, 5, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 5, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 6, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 6, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 6, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 0, 5, 0xF7, 0xF7, 0xF7, 0xF7, 5, - 2, 3, 0xF7, 0xF7, 5, - 3, 3, 0xF7, 0xF7, 5, - 3, 3, 0xF7, 0xF7, 5, - 4, 2, 0xF7, 5 -}; -const byte MOUSE1[] = { - // hotspot x and y, uint16 LE - 7, 0, 7, 0, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 6, 1, 0xF7, - 4, 5, 0xFF, 0xFF, 0, 0xFF, 0xFF, - 3, 7, 0xFF, 0, 0, 0, 0, 0, 0xFF, - 2, 9, 0xFF, 0, 0, 0, 0xF7, 0, 0, 0, 0xFF, - 1, 11, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, - 1, 11, 0xFF, 0, 0, 0, 0, 0xF7, 0, 0, 0, 0, 0xFF, - 0, 13, 0xF7, 0, 0, 0xF7, 0, 0xF7, 0, 0xF7, 0, 0xF7, 0, 0, 0xF7, - 1, 11, 0xFF, 0, 0, 0, 0, 0xF7, 0, 0, 0, 0, 0xFF, - 1, 11, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, - 2, 9, 0xFF, 0, 0, 0, 0xF7, 0, 0, 0, 0xFF, - 3, 7, 0xFF, 0, 0, 0, 0, 0, 0xFF, - 4, 5, 0xFF, 0xFF, 0, 0xFF, 0xFF, - 6, 1, 0xF7, - 0, 0, - 0, 0, - 0, 0 -}; -const byte MOUSE2[] = { - // hotspot x and y, uint16 LE - 8, 0, 8, 0, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0, 0, - 0, 0, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 2, 12, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 7, 2, 4, 5, - 0, 0, - 0, 0, - 0, 0 -}; -const byte MOUSE3[] = { - // hotspot x and y, uint16 LE - 0, 0, 0, 0, - // byte 1: number of skipped pixels - // byte 2: number of plotted pixels - // then, pixels - 0, 11, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 0, 12, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 5, - 0, 12, 6, 7, 7, 7, 7, 7, 7, 7, 7, 6, 5, 5, - 0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 5, 0, 0, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 0, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 5, - 0, 12, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, - 1, 11, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 0, 0, - 0, 0, - 0, 0 -}; -const byte *const CURSORS[4] = { MOUSE0, MOUSE1, MOUSE2, MOUSE3 }; +MartianResources::MartianResources(AccessEngine *vm) : Resources(vm) { +} -const int _travelPos[][2] = { - { -1, 0 }, - { 228, 117 }, - { 28, 98 }, - { 161, 140 }, - { 160, 116 }, - { 34, 119 }, - { 166, 105 }, - { 260, 126 }, - { 37, 107 }, - { 78, 139 }, - { 0, 0 }, - { 13, 112 }, - { 0, 0 }, - { 16, 122 }, - { 33, 126 }, - { 10, 160 }, - { 150, 102 }, - { 134, 160 }, - { 160, 76 }, - { 0, 0 }, - { 0, 0 }, - { 36, 116 }, - { 214, 113 }, - { 30, 127 }, - { 143, 131 }, - { 163, 103 }, - { 254, 106 }, - { 28, 161 }, - { 11, 164 }, - { 276, 134 }, - { 93, 118 }, - { 22, 150 }, - { 282, 156 }, - { 149, 92 }, - { 0, 0 }, - { 43, 410 }, - { 0, 0 }, - { 10, 136 }, - { 41, 100 }, - { 157, 97 }, - { -1, 5 }, - { -1, 4 }, - { -1, 10 }, - { -1, 7 }, - { -1, 3 }, - { -1, 8 }, - { -1, 6 }, - { -1, 20 }, - { -1, 18 }, - { -1, 19 }, - { -1, 21 } -}; - -const int INVENTORY_SIZE = 55; -const char *const INVENTORY_NAMES[] = { - "CAMERA", "LENS", "PHOTOS", "MAIL", "GUN", - "CASH", "COMLINK", "AMMO", "LOCKPICK KIT", "EARRING", - "RECIEPTS", "PAPER", "LADDER", "BOOTS", "DOCUMENTS", - "KNIFE", "DAGGER", "KEYS", "ROCK", "LOG", - "SHOVEL", "STONE", "REMOTE CONTROL", "FOOD AND WATER", "DOOR CARD KEY", - "FLASHLIGHT", "INTERLOCK KEY", "TOOLS", "REBREATHER", "JET PACK", - "ROD", "HCL2", "SAFE CARD KEY", "TUNING FORK", "STONE", - "ROSE", "KEY", "NOTE", "ALLEN WRENCH", "HOVER BOARD", - "BLUE PRINTS", "LETTER", "MEMORANDUM", "MARKERS", "FILM", - "ANDRETTI FILM", "GLASSES", "AMULET", "FACIAL KIT", "CAT FOOD", - "MONKEY WRENCH", "BIG DICK CARD", "BRA", "BOLT", nullptr -}; - -const byte ROOM_TABLE1[] = { - 0x00, 0x2f, 0x00, 0x0d, 0x00, 0x30, 0x22, 0x30, 0x01, 0x00, - 0x00, 0x00, 0x01, 0x01, 0x00, 0x03, 0x00, 0xff, 0x01, 0x00, - 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0xc0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE2[] = { - 0x00, 0x2f, 0x00, 0x0d, 0x00, 0x32, 0x28, 0x25, 0x02, 0x00, - 0x00, 0x00, 0x02, 0x02, 0x00, 0x03, 0x00, 0xff, 0x02, 0x00, - 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x06, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE3[] = { - 0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1e, 0x19, 0x24, 0x03, 0x00, - 0x00, 0x00, 0x03, 0x03, 0x00, 0x03, 0x00, 0xff, 0x03, 0x00, - 0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x78, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x02, 0x00, - 0x03, 0x00, 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x05, 0x00, - 0x01, 0x00, 0x03, 0x00, 0x06, 0x00, 0x01, 0x00, 0x2e, 0x00, - 0x01, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE4[] = { - 0x00, 0x2f, 0x00, 0x06, 0x00, 0x36, 0x27, 0x32, 0x04, 0x00, - 0x00, 0x00, 0x04, 0x04, 0x00, 0x03, 0x00, 0xff, 0x04, 0x00, - 0x02, 0x00, 0x04, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x05, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE5[] = { - 0x00, 0x2f, 0x00, 0x00, 0x00, 0x28, 0x19, 0x36, 0x05, 0x00, - 0x00, 0x00, 0x05, 0x05, 0x00, 0x03, 0x00, 0xff, 0x05, 0x00, - 0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0xa0, 0x20, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x02, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE6[] = { - 0x00, 0x2f, 0x00, 0x07, 0x00, 0x40, 0x36, 0x36, 0x06, 0x00, - 0x00, 0x00, 0x06, 0x06, 0x00, 0x03, 0x00, 0xff, 0x06, 0x00, - 0x02, 0x00, 0x06, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x13, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x08, 0x00, - 0x01, 0x00, 0x2e, 0x00, 0x14, 0x00, 0x01, 0x00, 0x2e, 0x00, - 0x07, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE7[] = { - 0x00, 0x2f, 0x00, 0x0e, 0x00, 0x40, 0x32, 0x3b, 0x07, 0x00, - 0x00, 0x00, 0x07, 0x07, 0x00, 0x03, 0x00, 0xff, 0x07, 0x00, - 0x02, 0x00, 0x07, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x14, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE8[] = { - 0x00, 0x2f, 0x00, 0x0a, 0x00, 0x30, 0x22, 0x46, 0x08, 0x00, - 0x00, 0x00, 0x08, 0x08, 0x00, 0x03, 0x00, 0xff, 0x08, 0x00, - 0x02, 0x00, 0x08, 0x00, 0x01, 0x00, 0xc0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE9[] = { - 0x00, 0x2f, 0x00, 0x07, 0x00, 0x32, 0x0c, 0x29, 0x09, 0x00, - 0x00, 0x00, 0x09, 0x09, 0x00, 0x03, 0x00, 0xff, 0x09, 0x00, - 0x02, 0x00, 0x09, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE11[] = { - 0x00, 0x2f, 0x00, 0x00, 0x00, 0x40, 0x3a, 0x22, 0x0b, 0x00, - 0x00, 0x00, 0x0b, 0x0b, 0x00, 0x03, 0x00, 0xff, 0x0b, 0x00, - 0x02, 0x00, 0x0b, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE13[] = { - 0x00, 0x2f, 0x00, 0x0c, 0x00, 0x40, 0x36, 0x2c, 0x0d, 0x00, - 0x00, 0x00, 0x0d, 0x0d, 0x00, 0x03, 0x00, 0xff, 0x0d, 0x00, - 0x02, 0x00, 0x0d, 0x00, 0x01, 0x00, 0xe6, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0x2e, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x2e, 0x00, - 0x15, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE14[] = { - 0x00, 0x2f, 0x00, 0x05, 0x00, 0x40, 0x3e, 0x33, 0x0e, 0x00, - 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x03, 0x00, 0xff, 0x0e, 0x00, - 0x02, 0x00, 0x0e, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x09, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0x2e, 0x00, 0x13, 0x00, 0x01, 0x00, 0x2e, 0x00, - 0x0a, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE15[] = { - 0x00, 0x2f, 0x00, 0x0c, 0x00, 0x28, 0x0c, 0x5e, 0x0f, 0x00, - 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x03, 0x00, 0xff, 0x0f, 0x00, - 0x02, 0x00, 0x0f, 0x00, 0x01, 0x00, 0xb4, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x11, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE16[] = { - 0x00, 0x2f, 0x00, 0x05, 0x00, 0x28, 0x1e, 0x24, 0x10, 0x00, - 0x00, 0x00, 0x10, 0x10, 0x00, 0x03, 0x00, 0xff, 0x10, 0x00, - 0x02, 0x00, 0x10, 0x00, 0x01, 0x00, 0xa0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE17[] = { - 0x00, 0x2f, 0x00, 0x06, 0x00, 0x28, 0x19, 0x2b, 0x11, 0x00, - 0x00, 0x00, 0x11, 0x11, 0x00, 0x03, 0x00, 0xff, 0x11, 0x00, - 0x02, 0x00, 0x11, 0x00, 0x01, 0x00, 0xa0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE18[] = { - 0x00, 0x2f, 0x00, 0x00, 0x00, 0x2d, 0x14, 0x3c, 0x12, 0x00, - 0x00, 0x00, 0x12, 0x12, 0x00, 0x03, 0x00, 0xff, 0x12, 0x00, - 0x02, 0x00, 0x12, 0x00, 0x01, 0x00, 0xb1, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE21[] = { - 0x00, 0x2f, 0x00, 0x07, 0x00, 0x3c, 0x2a, 0x29, 0x15, 0x00, - 0x00, 0x00, 0x15, 0x15, 0x00, 0x03, 0x00, 0xff, 0x15, 0x00, - 0x02, 0x00, 0x15, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x12, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE22[] = { - 0x00, 0x2f, 0x00, 0x0a, 0x00, 0x40, 0x2d, 0x27, 0x16, 0x00, - 0x00, 0x00, 0x16, 0x16, 0x00, 0x03, 0x00, 0xff, 0x16, 0x00, - 0x02, 0x00, 0x16, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE23[] = { - 0x00, 0x2f, 0x00, 0x0a, 0x00, 0x40, 0x38, 0x24, 0x17, 0x00, - 0x00, 0x00, 0x17, 0x17, 0x00, 0x03, 0x00, 0xff, 0x17, 0x00, - 0x02, 0x00, 0x17, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x17, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE24[] = { - 0x00, 0x2f, 0x00, 0x06, 0x00, 0x3e, 0x10, 0x62, 0x18, 0x00, - 0x00, 0x00, 0x18, 0x18, 0x00, 0x03, 0x00, 0xff, 0x18, 0x00, - 0x02, 0x00, 0x18, 0x00, 0x01, 0x00, 0xf8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE25[] = { - 0x00, 0x2f, 0x00, 0x0e, 0x00, 0x3e, 0x37, 0x19, 0x19, 0x00, - 0x00, 0x00, 0x19, 0x19, 0x00, 0x03, 0x00, 0xff, 0x19, 0x00, - 0x02, 0x00, 0x19, 0x00, 0x01, 0x00, 0xf8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x10, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE26[] = { - 0x00, 0x2f, 0x00, 0x06, 0x00, 0x34, 0x28, 0x28, 0x1a, 0x00, - 0x00, 0x00, 0x1a, 0x1a, 0x00, 0x03, 0x00, 0xff, 0x1a, 0x00, - 0x02, 0x00, 0x1a, 0x00, 0x01, 0x00, 0xd0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE27[] = { - 0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1b, 0x16, 0x18, 0x1b, 0x00, - 0x00, 0x00, 0x1b, 0x1b, 0x00, 0x03, 0x00, 0xff, 0x1b, 0x00, - 0x02, 0x00, 0x1b, 0x00, 0x01, 0x00, 0x70, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0d, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE28[] = { - 0x00, 0x2f, 0x00, 0x09, 0x00, 0x25, 0x10, 0x43, 0x1c, 0x00, - 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x03, 0x00, 0xff, 0x1c, 0x00, - 0x02, 0x00, 0x1c, 0x00, 0x01, 0x00, 0x94, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE29[] = { - 0x00, 0x2f, 0x00, 0x0a, 0x00, 0x20, 0x18, 0x56, 0x1d, 0x00, - 0x00, 0x00, 0x1d, 0x1d, 0x00, 0x03, 0x00, 0xff, 0x1d, 0x00, - 0x02, 0x00, 0x1d, 0x00, 0x01, 0x00, 0x80, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x17, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x10, 0x00, - 0x02, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE30[] = { - 0x00, 0x2f, 0x00, 0x07, 0x00, 0x3f, 0x1c, 0x27, 0x1e, 0x00, - 0x00, 0x00, 0x1e, 0x1e, 0x00, 0x03, 0x00, 0xff, 0x1e, 0x00, - 0x02, 0x00, 0x1e, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0x1e, 0x00, 0x04, 0x00, 0xff, 0xff, 0x2e, 0x00, - 0x00, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x15, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE31[] = { - 0x00, 0x2f, 0x00, 0x0d, 0x00, 0x32, 0x2e, 0x69, 0x1f, 0x00, - 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x03, 0x00, 0xff, 0x1f, 0x00, - 0x02, 0x00, 0x1f, 0x00, 0x01, 0x00, 0xc8, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE32[] = { - 0x00, 0x2f, 0x00, 0x07, 0x00, 0x40, 0x3b, 0x4b, 0x20, 0x00, - 0x00, 0x00, 0x20, 0x20, 0x00, 0x03, 0x00, 0xff, 0x20, 0x00, - 0x02, 0x00, 0x20, 0x00, 0x01, 0x00, 0xfe, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x05, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE33[] = { - 0x00, 0x2f, 0x00, 0x0b, 0x00, 0x30, 0x10, 0x51, 0x21, 0x00, - 0x00, 0x00, 0x21, 0x21, 0x00, 0x03, 0x00, 0xff, 0x21, 0x00, - 0x02, 0x00, 0x21, 0x00, 0x01, 0x00, 0xc0, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0xff, 0xff, -}; -const byte ROOM_TABLE35[] = { - 0x00, 0x2f, 0x00, 0x0f, 0x00, 0x1e, 0x18, 0x25, 0x23, 0x00, - 0x00, 0x00, 0x23, 0x23, 0x00, 0x03, 0x00, 0xff, 0x23, 0x00, - 0x02, 0x00, 0x23, 0x00, 0x01, 0x00, 0x78, 0x18, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x07, 0x00, - 0x01, 0x00, 0x2e, 0x00, 0x16, 0x00, 0x01, 0x00, 0x2e, 0x00, - 0x0c, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE37[] = { - 0x00, 0x2f, 0x00, 0x0f, 0x00, 0x3f, 0x3a, 0x1a, 0x25, 0x00, - 0x00, 0x00, 0x25, 0x25, 0x00, 0x03, 0x00, 0xff, 0x25, 0x00, - 0x02, 0x00, 0x25, 0x00, 0x01, 0x00, 0xfe, 0x40, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0d, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE38[] = { - 0x00, 0x2f, 0x00, 0x0d, 0x00, 0x40, 0x32, 0x32, 0x26, 0x00, - 0x00, 0x00, 0x26, 0x26, 0x00, 0x03, 0x00, 0xff, 0x26, 0x00, - 0x02, 0x00, 0x26, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x0b, 0x00, 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE39[] = { - 0x00, 0x2f, 0x00, 0x0a, 0x00, 0x3c, 0x10, 0x4c, 0x27, 0x00, - 0x00, 0x00, 0x27, 0x27, 0x00, 0x03, 0x00, 0xff, 0x27, 0x00, - 0x02, 0x00, 0x27, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x2e, 0x00, 0x00, 0x00, 0x01, 0x00, - 0x2e, 0x00, 0x11, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x0f, 0x00, - 0x01, 0x00, 0xff, 0xff, -}; -const byte ROOM_TABLE47[] = { - 0x00, 0x2f, 0x00, 0x06, 0x00, 0x28, 0x1e, 0x32, 0x2b, 0x00, - 0x00, 0x00, 0x46, 0x2b, 0x00, 0x03, 0x00, 0xff, 0x2b, 0x00, - 0x02, 0x00, 0x2b, 0x00, 0x01, 0x00, 0xf0, 0x00, 0xff, 0xff, - 0xff, 0xff, 0x2b, 0x00, 0x04, 0x00, 0xff, 0xff, 0x2e, 0x00, - 0x04, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, -}; -const byte *const ROOM_TABLE[] = { - nullptr, ROOM_TABLE1, ROOM_TABLE2, ROOM_TABLE3, ROOM_TABLE4, ROOM_TABLE5, ROOM_TABLE6, - ROOM_TABLE7, ROOM_TABLE8, ROOM_TABLE9, nullptr, ROOM_TABLE11, nullptr, ROOM_TABLE13, - ROOM_TABLE14, ROOM_TABLE15, ROOM_TABLE16, ROOM_TABLE17, ROOM_TABLE18, nullptr, nullptr, - ROOM_TABLE21, ROOM_TABLE22, ROOM_TABLE23, ROOM_TABLE24, ROOM_TABLE25, ROOM_TABLE26, ROOM_TABLE27, - ROOM_TABLE28, ROOM_TABLE29, ROOM_TABLE30, ROOM_TABLE31, ROOM_TABLE32, ROOM_TABLE33, nullptr, - ROOM_TABLE35, nullptr, ROOM_TABLE37, ROOM_TABLE38, ROOM_TABLE39, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, nullptr, ROOM_TABLE47 -}; - -const char *const ROOM_DESCR[] = { - nullptr, "TBD ROOM_TABLE1", "TBD ROOM_TABLE2", "TBD ROOM_TABLE3", "TBD ROOM_TABLE4", - "TBD ROOM_TABLE5", "TBD ROOM_TABLE6", "TBD ROOM_TABLE7", "TBD ROOM_TABLE8", "TBD ROOM_TABLE9", - nullptr, "TBD ROOM_TABLE11", nullptr, "TBD ROOM_TABLE13", "TBD ROOM_TABLE14", - "TBD ROOM_TABLE15", "TBD ROOM_TABLE16", "TBD ROOM_TABLE17", "TBD ROOM_TABLE18", nullptr, - nullptr, "TBD ROOM_TABLE21", "TBD ROOM_TABLE22", "TBD ROOM_TABLE23", "TBD ROOM_TABLE24", - "TBD ROOM_TABLE25", "TBD ROOM_TABLE26", "TBD ROOM_TABLE27", "TBD ROOM_TABLE28", "TBD ROOM_TABLE29", - "TBD ROOM_TABLE30", "TBD ROOM_TABLE31", "TBD ROOM_TABLE32", "TBD ROOM_TABLE33", nullptr, - "TBD ROOM_TABLE35", nullptr, "TBD ROOM_TABLE37", "TBD ROOM_TABLE38", "TBD ROOM_TABLE39", - nullptr, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, "TBD ROOM_TABLE47" -}; - -const int ROOM_NUMB = 48; - -const byte MMCHAR_0[] = { - 0x02, 0x31, 0x00, 0x08, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, -}; -const byte MMCHAR_2[] = { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x32, 0x33, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x33, 0x00, 0x00, 0x00, 0x33, - 0x00, 0x02, 0x00, 0x33, 0x00, 0x0b, 0x00, 0x33, 0x00, 0x03, - 0x00, 0x33, 0x00, 0x0c, 0x00, 0x33, 0x00, 0x04, 0x00, 0x33, - 0x00, 0x0d, 0x00, 0x33, 0x00, 0x05, 0x00, 0x33, 0x00, 0x0e, - 0x00, 0x33, 0x00, 0x06, 0x00, 0x33, 0x00, 0x0f, 0x00, 0x33, - 0x00, 0x07, 0x00, 0x33, 0x00, 0x10, 0x00, 0x33, 0x00, 0x08, - 0x00, 0x33, 0x00, 0x11, 0x00, 0x33, 0x00, 0x09, 0x00, 0x33, - 0x00, 0x12, 0x00, 0x33, 0x00, 0x0a, 0x00, 0x33, 0x00, 0x13, - 0x00, 0xff, 0xff, -}; -const byte MMCHAR_3[] = { - 0x02, 0x31, 0x00, 0x03, 0x00, 0x35, 0x00, 0x37, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x4b, 0x37, 0x00, 0x01, 0x00, - 0xff, 0x37, 0x00, 0x03, 0x00, 0x37, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_4[] = { - 0x01, 0x31, 0x00, 0x0a, 0x00, 0x36, 0x00, 0x35, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x49, 0x35, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x35, 0x00, 0x00, 0x00, 0x35, - 0x00, 0x03, 0x00, 0x35, 0x00, 0x0c, 0x00, 0x35, 0x00, 0x04, - 0x00, 0x35, 0x00, 0x0d, 0x00, 0x35, 0x00, 0x05, 0x00, 0x35, - 0x00, 0x0e, 0x00, 0x35, 0x00, 0x06, 0x00, 0x35, 0x00, 0x0f, - 0x00, 0x35, 0x00, 0x07, 0x00, 0x35, 0x00, 0x10, 0x00, 0x35, - 0x00, 0x08, 0x00, 0x35, 0x00, 0x11, 0x00, 0x35, 0x00, 0x09, - 0x00, 0x35, 0x00, 0x12, 0x00, 0x35, 0x00, 0x0a, 0x00, 0x35, - 0x00, 0x13, 0x00, 0x35, 0x00, 0x0b, 0x00, 0x35, 0x00, 0x14, - 0x00, 0xff, 0xff, -}; -const byte MMCHAR_5[] = { - 0x01, 0x31, 0x00, 0x08, 0x00, 0x37, 0x00, 0x34, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x48, 0x34, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x34, 0x00, 0x00, 0x00, 0x43, - 0x00, 0x00, 0x00, 0x34, 0x00, 0x03, 0x00, 0x43, 0x00, 0x01, - 0x00, 0x34, 0x00, 0x04, 0x00, 0x43, 0x00, 0x02, 0x00, 0x34, - 0x00, 0x05, 0x00, 0x43, 0x00, 0x03, 0x00, 0x34, 0x00, 0x06, - 0x00, 0x43, 0x00, 0x04, 0x00, 0x34, 0x00, 0x07, 0x00, 0x43, - 0x00, 0x05, 0x00, 0x34, 0x00, 0x08, 0x00, 0x43, 0x00, 0x06, - 0x00, 0x34, 0x00, 0x09, 0x00, 0x43, 0x00, 0x07, 0x00, 0x34, - 0x00, 0x0a, 0x00, 0x43, 0x00, 0x08, 0x00, 0x34, 0x00, 0x0b, - 0x00, 0x43, 0x00, 0x09, 0x00, 0x34, 0x00, 0x0c, 0x00, 0x43, - 0x00, 0x0a, 0x00, 0x34, 0x00, 0x0d, 0x00, 0x43, 0x00, 0x0b, - 0x00, 0x34, 0x00, 0x0e, 0x00, 0x43, 0x00, 0x0c, 0x00, 0x34, - 0x00, 0x0f, 0x00, 0x43, 0x00, 0x0d, 0x00, 0x34, 0x00, 0x10, - 0x00, 0xff, 0xff, -}; -const byte MMCHAR_6[] = { - 0x02, 0x31, 0x00, 0x03, 0x00, 0x38, 0x00, 0x44, 0x00, 0x03, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x4e, 0x44, 0x00, 0x01, 0x00, - 0xff, 0x44, 0x00, 0x02, 0x00, 0x44, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_7[] = { - 0x02, 0x31, 0x00, 0x01, 0x00, 0x39, 0x00, 0x38, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x4c, 0x38, 0x00, 0x01, 0x00, - 0xff, 0x38, 0x00, 0x03, 0x00, 0x38, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_8[] = { - 0x03, 0xff, 0xff, 0xff, 0xff, 0x3a, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x4d, 0x3b, 0x00, 0x01, 0x00, - 0xff, 0x3b, 0x00, 0x02, 0x00, 0x3b, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_9[] = { - 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x59, 0x4a, 0x00, 0x01, 0x00, - 0xff, 0x4a, 0x00, 0x02, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_10[] = { - 0x01, 0x31, 0x00, 0x0a, 0x00, 0x3c, 0x00, 0x36, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x4a, 0x36, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x36, 0x00, 0x00, 0x00, 0x36, - 0x00, 0x03, 0x00, 0x36, 0x00, 0x13, 0x00, 0x36, 0x00, 0x04, - 0x00, 0x36, 0x00, 0x14, 0x00, 0x36, 0x00, 0x05, 0x00, 0x36, - 0x00, 0x15, 0x00, 0x36, 0x00, 0x06, 0x00, 0x36, 0x00, 0x16, - 0x00, 0x36, 0x00, 0x07, 0x00, 0x36, 0x00, 0x17, 0x00, 0x36, - 0x00, 0x08, 0x00, 0x36, 0x00, 0x18, 0x00, 0x36, 0x00, 0x09, - 0x00, 0x36, 0x00, 0x19, 0x00, 0x36, 0x00, 0x0a, 0x00, 0x36, - 0x00, 0x1a, 0x00, 0x36, 0x00, 0x0b, 0x00, 0x36, 0x00, 0x1b, - 0x00, 0x36, 0x00, 0x0c, 0x00, 0x36, 0x00, 0x1c, 0x00, 0x36, - 0x00, 0x0d, 0x00, 0x36, 0x00, 0x1d, 0x00, 0x36, 0x00, 0x0e, - 0x00, 0x36, 0x00, 0x1e, 0x00, 0x36, 0x00, 0x0f, 0x00, 0x36, - 0x00, 0x1f, 0x00, 0x36, 0x00, 0x10, 0x00, 0x36, 0x00, 0x20, - 0x00, 0x36, 0x00, 0x11, 0x00, 0x36, 0x00, 0x21, 0x00, 0x36, - 0x00, 0x12, 0x00, 0x36, 0x00, 0x22, 0x00, 0xff, 0xff, -}; -const byte MMCHAR_11[] = { - 0x03, 0xff, 0xff, 0xff, 0xff, 0x3d, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x55, 0x45, 0x00, 0x01, 0x00, - 0xff, 0x45, 0x00, 0x02, 0x00, 0x45, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_12[] = { - 0x03, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x4f, 0x40, 0x00, 0x01, 0x00, - 0xff, 0x40, 0x00, 0x02, 0x00, 0x40, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_13[] = { - 0x00, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x46, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x56, 0x46, 0x00, 0x01, 0x00, - 0xff, 0x46, 0x00, 0x03, 0x00, 0x46, 0x00, 0x00, 0x00, 0x46, - 0x00, 0x04, 0x00, 0x46, 0x00, 0x0d, 0x00, 0x46, 0x00, 0x05, - 0x00, 0x46, 0x00, 0x0e, 0x00, 0x46, 0x00, 0x06, 0x00, 0x46, - 0x00, 0x0f, 0x00, 0x46, 0x00, 0x07, 0x00, 0x46, 0x00, 0x10, - 0x00, 0x46, 0x00, 0x08, 0x00, 0x46, 0x00, 0x11, 0x00, 0x46, - 0x00, 0x09, 0x00, 0x46, 0x00, 0x12, 0x00, 0x46, 0x00, 0x0a, - 0x00, 0x46, 0x00, 0x13, 0x00, 0x46, 0x00, 0x0b, 0x00, 0x46, - 0x00, 0x14, 0x00, 0x46, 0x00, 0x0c, 0x00, 0x46, 0x00, 0x15, - 0x00, 0xff, 0xff, -}; -const byte MMCHAR_15[] = { - 0x00, 0xff, 0xff, 0xff, 0xff, 0x41, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x57, 0x47, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x00, 0x00, 0x00, 0x47, - 0x00, 0x02, 0x00, 0x47, 0x00, 0x05, 0x00, 0x47, 0x00, 0x03, - 0x00, 0x47, 0x00, 0x06, 0x00, 0x47, 0x00, 0x04, 0x00, 0x47, - 0x00, 0x07, 0x00, 0xff, 0xff, -}; -const byte MMCHAR_16[] = { - 0x03, 0xff, 0xff, 0xff, 0xff, 0x42, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x54, 0x41, 0x00, 0x01, 0x00, - 0xff, 0x41, 0x00, 0x02, 0x00, 0x41, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_18[] = { - 0x02, 0x31, 0x00, 0x07, 0x00, 0x44, 0x00, 0x3c, 0x00, 0x03, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x50, 0x3c, 0x00, 0x01, 0x00, - 0xff, 0x3c, 0x00, 0x02, 0x00, 0x3c, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_19[] = { - 0x02, 0x31, 0x00, 0x07, 0x00, 0x45, 0x00, 0x3d, 0x00, 0x03, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x51, 0x3d, 0x00, 0x01, 0x00, - 0xff, 0x3d, 0x00, 0x02, 0x00, 0x3d, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_20[] = { - 0x02, 0x31, 0x00, 0x02, 0x00, 0x46, 0x00, 0x48, 0x00, 0x02, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x58, 0x48, 0x00, 0x01, 0x00, - 0xff, 0x48, 0x00, 0x03, 0x00, 0x48, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_21[] = { - 0x02, 0x31, 0x00, 0x07, 0x00, 0x47, 0x00, 0x3e, 0x00, 0x03, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x52, 0x3e, 0x00, 0x01, 0x00, - 0xff, 0x3e, 0x00, 0x02, 0x00, 0x3e, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_23[] = { - 0x02, 0x31, 0x00, 0x08, 0x00, 0x49, 0x00, 0x3f, 0x00, 0x03, - 0x00, 0x80, 0x00, 0xf7, 0x00, 0x53, 0x3f, 0x00, 0x01, 0x00, - 0xff, 0x3f, 0x00, 0x02, 0x00, 0x3f, 0x00, 0x00, 0x00, 0xff, - 0xff, -}; -const byte MMCHAR_24[] = { - 0x02, 0x32, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x47, 0x32, 0x00, 0x02, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x32, 0x00, 0x01, 0x00, 0x32, - 0x00, 0x03, 0x00, 0x32, 0x00, 0x0a, 0x00, 0x32, 0x00, 0x04, - 0x00, 0x32, 0x00, 0x0b, 0x00, 0x32, 0x00, 0x05, 0x00, 0x32, - 0x00, 0x0c, 0x00, 0x32, 0x00, 0x06, 0x00, 0x32, 0x00, 0x0d, - 0x00, 0x32, 0x00, 0x07, 0x00, 0x32, 0x00, 0x0e, 0x00, 0x32, - 0x00, 0x08, 0x00, 0x32, 0x00, 0x0f, 0x00, 0x32, 0x00, 0x09, - 0x00, 0x32, 0x00, 0x10, 0x00, 0xff, 0xff -}; -const byte MMCHAR_25[] = { - 0x02, 0x39, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0x39, 0x00, 0x00, 0x00, 0x39, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xFF -}; -const byte MMCHAR_26[] = { - 0x01, 0x3a, 0x00, 0x01, 0x00, 0x0a, 0x00, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x3a, 0x00, 0x02, 0x00, - 0xff, 0x3a, 0x00, 0x03, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x42, - 0x00, 0x00, 0x00, 0x3a, 0x00, 0x04, 0x00, 0x42, 0x00, 0x01, - 0x00, 0x3a, 0x00, 0x05, 0x00, 0x42, 0x00, 0x02, 0x00, 0x3a, - 0x00, 0x06, 0x00, 0x42, 0x00, 0x03, 0x00, 0x3a, 0x00, 0x07, - 0x00, 0x42, 0x00, 0x04, 0x00, 0x3a, 0x00, 0x08, 0x00, 0x42, - 0x00, 0x05, 0x00, 0x3a, 0x00, 0x09, 0x00, 0x42, 0x00, 0x06, - 0x00, 0x3a, 0x00, 0x0a, 0x00, 0x42, 0x00, 0x07, 0x00, 0x3a, - 0x00, 0x0b, 0x00, 0x42, 0x00, 0x08, 0x00, 0x3a, 0x00, 0x0c, - 0x00, 0x42, 0x00, 0x09, 0x00, 0x3a, 0x00, 0x0d, 0x00, 0x42, - 0x00, 0x0a, 0x00, 0x3a, 0x00, 0x0e, 0x00, 0x42, 0x00, 0x0b, - 0x00, 0x3a, 0x00, 0x0f, 0x00, 0x42, 0x00, 0x0c, 0x00, 0x3a, - 0x00, 0x10, 0x00, 0x42, 0x00, 0x0d, 0x00, 0x3a, 0x00, 0x11, - 0x00, 0x42, 0x00, 0x0e, 0x00, 0x3a, 0x00, 0x12, 0x00, 0x42, - 0x00, 0x0f, 0x00, 0x3a, 0x00, 0x13, 0x00, 0x42, 0x00, 0x10, - 0x00, 0x3a, 0x00, 0x14, 0x00, 0x42, 0x00, 0x11, 0x00, 0x3a, - 0x00, 0x15, 0x00, 0xff, 0xff -}; -const byte MMCHAR_27[] = { - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0x58, 0x49, 0x00, 0x01, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0x49, 0x00, 0x00, 0x00, 0x49, - 0x00, 0x02, 0x00, 0x49, 0x00, 0x0a, 0x00, 0x49, 0x00, 0x03, - 0x00, 0x49, 0x00, 0x0b, 0x00, 0x49, 0x00, 0x04, 0x00, 0x49, - 0x00, 0x0c, 0x00, 0x49, 0x00, 0x05, 0x00, 0x49, 0x00, 0x0d, - 0x00, 0x49, 0x00, 0x06, 0x00, 0x49, 0x00, 0x0e, 0x00, 0x49, - 0x00, 0x07, 0x00, 0x49, 0x00, 0x0f, 0x00, 0x49, 0x00, 0x08, - 0x00, 0x49, 0x00, 0x10, 0x00, 0x49, 0x00, 0x09, 0x00, 0x49, - 0x00, 0x11, 0x00, 0xff, 0xff, -}; - -// HACK: MMCHAR_0 has been used to replace the missing CHAR: 1, 14, 17 and 22 -const byte *const CHARTBL_MM[] = { - MMCHAR_0, MMCHAR_0, MMCHAR_2, MMCHAR_3, MMCHAR_4, - MMCHAR_5, MMCHAR_6, MMCHAR_7, MMCHAR_8, MMCHAR_9, - MMCHAR_10, MMCHAR_11, MMCHAR_12, MMCHAR_13, MMCHAR_0, - MMCHAR_15, MMCHAR_16, MMCHAR_0, MMCHAR_18, MMCHAR_19, - MMCHAR_20, MMCHAR_21, MMCHAR_0, MMCHAR_23, MMCHAR_24, - MMCHAR_25, MMCHAR_26, MMCHAR_27 -}; +/*------------------------------------------------------------------------*/ const int SIDEOFFR[] = { 4, 0, 7, 10, 3, 1, 2, 13, 0, 0, 0, 0 }; const int SIDEOFFL[] = { 11, 6, 1, 4, 10, 6, 1, 4, 0, 0, 0, 0 }; @@ -765,7 +85,7 @@ const char *const TRAVDATA[] = { "COOPER BRADBURY", nullptr }; -const char *const _askTBL[] = { +const char *const ASK_TBL[] = { "NONE", "MARSHALL ALEXANDER", "TERRAFORM CORP.", "COLLIER STANTON", "ROCKWELL BACHE", "JOCQUES SPARROW", "NORA DESMOND ALEXANDER", "GALACTIC PICTURES", "LAWRENCE BARKLEY", "TMS", "MAC MALDEN", "STANTON EXPEDITION", "LOWELL PERCIVAL", "CHANTAL VARGAS", "RICK LOGAN", @@ -783,33 +103,6 @@ byte HELP[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; -const byte DEATH_SCREENS[] = { - 5, 5, 3, 3, 7, 4, 6, 2, 2, 2, 1, 5, 3, 5, 2, 8, 5, 3, 8, 5 -}; - -const char *const DEATHMESSAGE[] = { - "A VICIOUS THUG PULLS OUT HIS GUN AND AIR CONDITIONS YOUR BRAIN.", - "BIG DICK COMES BACK AND ANNOUNCES YOUR TIME IS UP. ONE OF HIS BOYS PROCEEDS TO PART YOUR EYEBROWS.", - "ALTHOUGH HIS FIRST SHOT MISSED, THE PUNK FINDS YOU AND TURNS YOU INTO A DOUGHNUT.", - "THE CREEP SPOTS YOU. HE TURNS AND FIRES HIS WEAPON. IT BURNS A HOLE A BUZZARD CAN FLY THROUGH.", - "OBVIOUSLY RICK LOGAN HAS A FEW TRICK UP HIS SLEEVE. A TREMENDOUS WEIGHT HITS YOUR HEAD. YOU MUMBLE; WATCH OUT FOR THAT TREE...", - "SLOWLY SINKING IN THE SLIMY OOZE, YOU THINK OF SEVERAL JELLO WRESTLING MATCHES YOU'VE ATTENDED. BUT NO MORE...", - "THE PATH SUDDENLY GIVES WAY AND YOU FEEL MANY STAKES TEAR THROUGH YOUR FLESH. HOW DO YOU LIKE YOUR STAKE", - "THE SNAKE SINKS ITS FANGS INTO YOU LEG. THE POISON WORKS QUICKLY. THE SNAKE THEN SWALLOWS YOU WHOLE.", - "YOU FADE AWAY, GLOWING LIKE A LIGHTBULB.", - "YOU TOUCH THE BUBBLING RADIOACTIVE SELTZER. IT IMMEDIATELY CAUSES VITAL ORGANS TO ELONGATE AND EXPLODE. YOU DIE WITH AN ABSURD AND FOOLISH LOOK ON YOUR FACE.", - "THE DOGS PRETTY HUNGRY. IT WON'T TAKE HIM LONG TO FINISH SO SIT BACK AND ENJOY IT.", - "ROCKY DOESN'T LIKE BEING FOLLOWED. HE DECIDES TO BEAT YOU. WITHIN AND INCH OF YOUR LIFE. UNFORTUNATELY, HE MISJUDGED THE DISTANCE", - "YOU STUMBLE INTO DEADLY LASER FIRE.", - "THE OUTPOST AND YOUR BODY PARTS ARE BLOWN TO KINGDOM COME.", - "YOU REACH THE TOP, BUT YOUR AIR SOON RUNS OUT LEAVING YOU BREATHLESS.", - "YOU DIE IN THE FIERY EXPLOSION.", - "YOU FALL HUNDREDS OF FEET TO YOUR DEATH.", - "YOU WALK ONTO A PRESSURE SENSITIVE SECURITY PAD. A LASER ZEROS IN AND BLOWS A HOLE THE SIZE OF A SUBARU TIRE THROUGH YOU.", - "DANGERFIELD'S EXPERIMENT BACKFIRES. IT RELEASES A DEMON FROM HIS SUBCONSCIOUS WHICH DESTROYS THE ENTIRE PLANET.", - "ONCE DANGERFIELD GETS OUT OF HIS CHAMBER, HE PULLS OUT A WEAPON AND LETS YOU HAVE IT." -}; - const char *const SPEC7MESSAGE = { "THOMAS DANGERFIELD'S MAD EXPERIMENT OF ATTEMPTING TO HARNESS THE STONE'S POWER, ENDED HIS LIFE. DANGERFIELD WAS A DECENT HUMAN " \ "BEING ONCE, BUT WAS DRIVEN INSANE BY HIS QUEST FOR THE ULTIMATE POWER. ALEXIS AND I DECIDE THAT DEACON HAWKE IS THE ONLY " \ diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h index 2eb810ac80..3a4d08b007 100644 --- a/engines/access/martian/martian_resources.h +++ b/engines/access/martian/martian_resources.h @@ -24,31 +24,17 @@ #define ACCESS_MARTIAN_RESOURCES_H #include "common/scummsys.h" +#include "access/resources.h" namespace Access { namespace Martian { -extern const char *const FILENAMES[]; - extern const int SIDEOFFR[]; extern const int SIDEOFFL[]; extern const int SIDEOFFU[]; extern const int SIDEOFFD[]; -extern const byte *const CURSORS[4]; - -extern const int _travelPos[][2]; - -extern const int INVENTORY_SIZE; -extern const char *const INVENTORY_NAMES[]; - -extern const byte *const ROOM_TABLE[]; -extern const char *const ROOM_DESCR[]; -extern const int ROOM_NUMB; - -extern const byte *const CHARTBL_MM[]; - extern const int SIDEOFFR[]; extern const int SIDEOFFL[]; extern const int SIDEOFFU[]; @@ -60,16 +46,23 @@ extern const byte ICON_PALETTE[]; extern const int RMOUSE[10][2]; extern byte HELP[]; -extern const char *const _askTBL[]; +extern const char *const ASK_TBL[]; extern const char *const TRAVDATA[]; -extern const byte DEATH_SCREENS[]; -extern const char *const DEATHMESSAGE[]; extern const char *const SPEC7MESSAGE; extern const byte _byte1EEB5[]; extern const int PICTURERANGE[][2]; +class MartianResources : public Resources { +public: + +public: + MartianResources(AccessEngine *vm); +}; + +#define MMRES (*((Martian::MartianResources *)_vm->_res)) + } // End of namespace Martian } // End of namespace Access diff --git a/engines/access/martian/martian_room.cpp b/engines/access/martian/martian_room.cpp index d5b03db246..0b8b4a842a 100644 --- a/engines/access/martian/martian_room.cpp +++ b/engines/access/martian/martian_room.cpp @@ -39,7 +39,7 @@ MartianRoom::~MartianRoom() { } void MartianRoom::loadRoom(int roomNumber) { - loadRoomData(ROOM_TABLE[roomNumber]); + loadRoomData(&MMRES.ROOMTBL[roomNumber]._data[0]); } void MartianRoom::reloadRoom() { diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp index 8699a4a82f..3dbdc9242b 100644 --- a/engines/access/resources.cpp +++ b/engines/access/resources.cpp @@ -22,9 +22,143 @@ #include "access/resources.h" #include "access/access.h" +#include "access/amazon/amazon_resources.h" +#include "access/martian/martian_resources.h" namespace Access { +Resources *Resources::init(AccessEngine *vm) { + if (vm->getGameID() == GType_Amazon) + return new Amazon::AmazonResources(vm); + else if (vm->getGameID() == GType_MartianMemorandum) + return new Martian::MartianResources(vm); + + error("Unknown game"); +} + +Resources::Resources(AccessEngine *vm): _vm(vm) { +} + +bool Resources::load(Common::String &errorMessage) { + Common::File f; + if (!f.open("access.dat")) { + errorMessage = "Could not locate required access.dat file"; + return false; + } + + // Check for the magic identifier + char buffer[4]; + f.read(buffer, 4); + if (strncmp(buffer, "SVMA", 4)) { + errorMessage = "Located access.dat file had invalid contents"; + return false; + } + + // Validate the version number + uint expectedVersion = 1; + uint version = f.readUint16LE(); + if (version != expectedVersion) { + errorMessage = Common::String::format( + "Incorrect version of access.dat found. Expected %d but got %d", + expectedVersion, version); + return false; + } + + // Load in the index + uint count = f.readUint16LE(); + _datIndex.resize(count); + for (uint idx = 0; idx < _datIndex.size(); ++idx) { + _datIndex[idx]._gameId = f.readByte(); + _datIndex[idx]._discType = f.readByte(); + _datIndex[idx]._demoType = f.readByte(); + _datIndex[idx]._language = (Common::Language)f.readByte(); + _datIndex[idx]._fileOffset = f.readUint32LE(); + } + + // Load in the data for the game + load(f); + + return true; +} + +void Resources::load(Common::SeekableReadStream &s) { + uint count; + + // Get the offset of the data for the game + uint entryOffset = findEntry(_vm->getGameID(), _vm->isCD() ? 1 : 0, + _vm->isDemo() ? 1 : 0, _vm->getLanguage()); + s.seek(entryOffset); + + // Load filename list + count = s.readUint16LE(); + FILENAMES.resize(count); + for (uint idx = 0; idx < count; ++idx) + FILENAMES[idx] = readString(s); + + // Load the character data + count = s.readUint16LE(); + CHARTBL.resize(count); + for (uint idx = 0; idx < count; ++idx) { + uint count2 = s.readUint16LE(); + CHARTBL[idx].resize(count2); + if (count2 > 0) + s.read(&CHARTBL[idx][0], count2); + } + + // Load the room data + count = s.readUint16LE(); + ROOMTBL.resize(count); + for (uint idx = 0; idx < count; ++idx) { + ROOMTBL[idx]._desc = readString(s); + ROOMTBL[idx]._travelPos.x = s.readSint16LE(); + ROOMTBL[idx]._travelPos.y = s.readSint16LE(); + uint count2 = s.readUint16LE(); + ROOMTBL[idx]._data.resize(count2); + if (count2 > 0) + s.read(&ROOMTBL[idx]._data[0], count2); + } + + // Load the deaths list + count = s.readUint16LE(); + DEATHS.resize(count); + for (uint idx = 0; idx < count; ++idx) { + DEATHS[idx]._screenId = s.readByte(); + DEATHS[idx]._msg = readString(s); + } + + // Load in the inventory list + count = s.readUint16LE(); + INVENTORY.resize(count); + for (uint idx = 0; idx < count; ++idx) { + INVENTORY[idx]._desc = readString(s); + for (uint idx2 = 0; idx2 < 4; ++idx2) + INVENTORY[idx]._combo[idx2] = s.readSint16LE(); + } +} + +uint Resources::findEntry(byte gameId, byte discType, byte demoType, Common::Language language) { + for (uint idx = 0; idx < _datIndex.size(); ++idx) { + DATEntry &de = _datIndex[idx]; + if (de._gameId == gameId && de._discType == discType && + de._demoType == demoType && de._language == language) + return de._fileOffset; + } + + error("Could not locate appropriate access.dat entry"); +} + +Common::String Resources::readString(Common::SeekableReadStream &s) { + Common::String result; + char c; + + while ((c = s.readByte()) != 0) + result += c; + + return result; +} + +/*------------------------------------------------------------------------*/ + const byte INITIAL_PALETTE[18 * 3] = { 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, diff --git a/engines/access/resources.h b/engines/access/resources.h index 07b8e5ada9..a9218036b5 100644 --- a/engines/access/resources.h +++ b/engines/access/resources.h @@ -24,6 +24,11 @@ #define ACCESS_RESOURCES_H #include "common/scummsys.h" +#include "common/array.h" +#include "common/language.h" +#include "common/rect.h" +#include "common/str-array.h" +#include "common/stream.h" namespace Access { @@ -33,6 +38,65 @@ extern const char *const GENERAL_MESSAGES[]; extern const int INVCOORDS[][4]; +class AccessEngine; + +class Resources { + struct DATEntry { + byte _gameId; + byte _discType; + byte _demoType; + Common::Language _language; + uint _fileOffset; + }; + struct RoomEntry { + Common::String _desc; + Common::Point _travelPos; + Common::Array _data; + }; + struct DeathEntry { + byte _screenId; + Common::String _msg; + }; + struct InventoryEntry { + Common::String _desc; + int _combo[4]; + }; +protected: + AccessEngine *_vm; + Common::Array _datIndex; + + /** + * Locate a specified entry in the index and return it's file offset + */ + uint findEntry(byte gameId, byte discType, byte demoType, Common::Language language); + + /** + * Read a string in from the passed stream + */ + Common::String readString(Common::SeekableReadStream &s); + + /** + * Load data from the access.dat file + */ + virtual void load(Common::SeekableReadStream &s); +public: + Common::StringArray FILENAMES; + Common::Array< Common::Array > CHARTBL; + Common::Array ROOMTBL; + Common::Array DEATHS; + Common::Array INVENTORY; + Common::Array< Common::Array > CURSORS; + Common::String CANT_GET_THERE; +public: + Resources(AccessEngine *vm); + static Resources *init(AccessEngine *vm); + + /** + * Load the access.dat file + */ + bool load(Common::String &errorMessage); +}; + } // End of namespace Access #endif /* ACCESS_RESOURCES_H */ diff --git a/engines/access/room.cpp b/engines/access/room.cpp index d0f1e59569..759af74cff 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -927,16 +927,9 @@ RoomInfo::RoomInfo(const byte *data, int gameType, bool isCD, bool isDemo) { _roomFlag = stream.readByte(); - if (gameType == GType_Amazon) { - if (isCD) - _estIndex = stream.readSint16LE(); - else { - _estIndex = -1; - if (!isDemo) - stream.readSint16LE(); - } - } else - _estIndex = -1; + _estIndex = -1; + if (gameType == GType_Amazon && isCD) + _estIndex = stream.readSint16LE(); _musicFile.load(stream); _scaleH1 = stream.readByte(); diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 41dd5cc0d0..12328566fc 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -689,19 +689,20 @@ void Scripts::cmdDoTravel() { int idx = _vm->_travelBox->_tempListIdx[boxX]; if (Martian::_byte1EEB5[idx] != _vm->_byte26CB5) { _vm->_bubbleBox->_bubbleTitle = "_travel"; - _vm->_bubbleBox->printString("YOU CAN'T GET THERE FROM HERE."); + _vm->_bubbleBox->printString(_vm->_res->CANT_GET_THERE); continue; } if (_vm->_player->_roomNumber != idx) { _vm->_player->_roomNumber = idx; _vm->_room->_function = FN_CLEAR1; - if (Martian::_travelPos[idx][0] == -1) { + if (_vm->_res->ROOMTBL[idx]._travelPos.x == -1) { + // For x == -1, the y value is a script Id, not a co-ordinate _vm->_player->_roomNumber = idx; _vm->_room->_conFlag = true; - _vm->_scripts->converse1(Martian::_travelPos[idx][1]); + _vm->_scripts->converse1(_vm->_res->ROOMTBL[idx]._travelPos.y); return; } - _vm->_player->_rawPlayer = Common::Point(Martian::_travelPos[idx][0], Martian::_travelPos[idx][1]); + _vm->_player->_rawPlayer = _vm->_res->ROOMTBL[idx]._travelPos; cmdRetPos(); return; } @@ -1033,7 +1034,7 @@ void Scripts::cmdPrintWatch() { } void Scripts::cmdDispAbout() { - _vm->_travelBox->getList(Martian::_askTBL, _vm->_ask); + _vm->_travelBox->getList(Martian::ASK_TBL, _vm->_ask); int btnSelected = 0; int boxX = _vm->_aboutBox->doBox_v1(_vm->_startAboutItem, _vm->_startAboutBox, btnSelected); _vm->_startAboutItem = _vm->_boxDataStart; diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index 51ffb88f37..b3317cee5f 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -213,7 +213,7 @@ MusicManager::MusicManager(AccessEngine *vm) : _vm(vm) { // switch (musicType) { case MT_ADLIB: { - if (_vm->getGameID() == GType_Amazon) { + if (_vm->getGameID() == GType_Amazon && !_vm->isDemo()) { Resource *midiDrvResource = _vm->_files->loadFile(92, 1); Common::MemoryReadStream *adLibInstrumentStream = new Common::MemoryReadStream(midiDrvResource->data(), midiDrvResource->_size); -- cgit v1.2.3 From 1fe6e92bf9cd22becab56656444e1ae471ce6746 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 27 Nov 2015 12:40:33 -0500 Subject: ACCESS: Silence gcc warnings --- engines/access/amazon/amazon_resources.cpp | 3 --- engines/access/amazon/amazon_resources.h | 3 ++- engines/access/martian/martian_resources.cpp | 5 ----- engines/access/martian/martian_resources.h | 3 ++- engines/access/resources.cpp | 3 --- engines/access/resources.h | 3 ++- 6 files changed, 6 insertions(+), 14 deletions(-) (limited to 'engines') diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index 2be1c0f8ba..7dbe1c9f90 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -27,9 +27,6 @@ namespace Access { namespace Amazon { -AmazonResources::AmazonResources(AccessEngine *vm): Resources(vm) { -} - void AmazonResources::load(Common::SeekableReadStream &s) { Resources::load(s); uint count; diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h index ca0bfeb5b7..20d90cc5b6 100644 --- a/engines/access/amazon/amazon_resources.h +++ b/engines/access/amazon/amazon_resources.h @@ -140,7 +140,8 @@ public: Common::String HELPLVLTXT[3]; Common::String IQLABELS[9]; public: - AmazonResources(AccessEngine *vm); + AmazonResources(AccessEngine *vm) : Resources(vm) {} + virtual ~AmazonResources() {} }; #define AMRES (*((Amazon::AmazonResources *)_vm->_res)) diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp index dc75b83379..070fa0f7e3 100644 --- a/engines/access/martian/martian_resources.cpp +++ b/engines/access/martian/martian_resources.cpp @@ -27,11 +27,6 @@ namespace Access { namespace Martian { -MartianResources::MartianResources(AccessEngine *vm) : Resources(vm) { -} - -/*------------------------------------------------------------------------*/ - const int SIDEOFFR[] = { 4, 0, 7, 10, 3, 1, 2, 13, 0, 0, 0, 0 }; const int SIDEOFFL[] = { 11, 6, 1, 4, 10, 6, 1, 4, 0, 0, 0, 0 }; const int SIDEOFFU[] = { 1, 2, 0, 2, 2, 1, 1, 0, 0, 0, 0, 0 }; diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h index 3a4d08b007..46cf6a71c1 100644 --- a/engines/access/martian/martian_resources.h +++ b/engines/access/martian/martian_resources.h @@ -58,7 +58,8 @@ class MartianResources : public Resources { public: public: - MartianResources(AccessEngine *vm); + MartianResources(AccessEngine *vm) : Resources(vm) {} + virtual ~MartianResources() {} }; #define MMRES (*((Martian::MartianResources *)_vm->_res)) diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp index 3dbdc9242b..c11dbf6331 100644 --- a/engines/access/resources.cpp +++ b/engines/access/resources.cpp @@ -36,9 +36,6 @@ Resources *Resources::init(AccessEngine *vm) { error("Unknown game"); } -Resources::Resources(AccessEngine *vm): _vm(vm) { -} - bool Resources::load(Common::String &errorMessage) { Common::File f; if (!f.open("access.dat")) { diff --git a/engines/access/resources.h b/engines/access/resources.h index a9218036b5..bb5c3f9f61 100644 --- a/engines/access/resources.h +++ b/engines/access/resources.h @@ -88,7 +88,8 @@ public: Common::Array< Common::Array > CURSORS; Common::String CANT_GET_THERE; public: - Resources(AccessEngine *vm); + Resources(AccessEngine *vm) : _vm(vm) {} + virtual ~Resources() {} static Resources *init(AccessEngine *vm); /** -- cgit v1.2.3 From 1f1c9803a7debcc09dba0959ce5457eb592dbd49 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:17:09 +0100 Subject: PRINCE: Fix color clipping logic --- engines/prince/graphics.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines') diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp index f556d81eab..3482d79f69 100644 --- a/engines/prince/graphics.cpp +++ b/engines/prince/graphics.cpp @@ -375,30 +375,30 @@ byte GraphicsMan::getBlendTableColor(byte pixelColor, byte backgroundPixelColor, const byte *originalPalette = _vm->_roomBmp->getPalette(); int redFirstOrg = originalPalette[pixelColor * 3] * _vm->_mst_shadow / 256; - CLIP(redFirstOrg, 0, 255); + redFirstOrg = CLIP(redFirstOrg, 0, 255); if (_vm->_mst_shadow <= 256) { int redFirstBack = originalPalette[backgroundPixelColor * 3] * (256 - _vm->_mst_shadow) / 256; - CLIP(redFirstBack, 0, 255); + redFirstBack = CLIP(redFirstBack, 0, 255); redFirstOrg += redFirstBack; - CLIP(redFirstOrg, 0, 255); + redFirstOrg = CLIP(redFirstOrg, 0, 255); } int greenFirstOrg = originalPalette[pixelColor * 3 + 1] * _vm->_mst_shadow / 256; - CLIP(greenFirstOrg, 0, 255); + greenFirstOrg = CLIP(greenFirstOrg, 0, 255); if (_vm->_mst_shadow <= 256) { int greenFirstBack = originalPalette[backgroundPixelColor * 3 + 1] * (256 - _vm->_mst_shadow) / 256; - CLIP(greenFirstBack, 0, 255); + greenFirstBack = CLIP(greenFirstBack, 0, 255); greenFirstOrg += greenFirstBack; - CLIP(greenFirstOrg, 0, 255); + greenFirstOrg = CLIP(greenFirstOrg, 0, 255); } int blueFirstOrg = originalPalette[pixelColor * 3 + 2] * _vm->_mst_shadow / 256; - CLIP(blueFirstOrg, 0, 255); + blueFirstOrg = CLIP(blueFirstOrg, 0, 255); if (_vm->_mst_shadow <= 256) { int blueFirstBack = originalPalette[backgroundPixelColor * 3 + 2] * (256 - _vm->_mst_shadow) / 256; - CLIP(blueFirstBack, 0, 255); + blueFirstBack = CLIP(blueFirstBack, 0, 255); blueFirstOrg += blueFirstBack; - CLIP(blueFirstOrg, 0, 255); + blueFirstOrg = CLIP(blueFirstOrg, 0, 255); } int bigValue = PrinceEngine::kIntMax; // infinity -- cgit v1.2.3 From 6e9fe0052c032e8209d8b549023e40f4e570bdd9 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:19:41 +0100 Subject: CGE2: Fix rounding error --- engines/cge2/vga13h.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp index f4064f3565..eb111c3255 100644 --- a/engines/cge2/vga13h.cpp +++ b/engines/cge2/vga13h.cpp @@ -629,11 +629,11 @@ void Sprite::gotoxyz(V2D pos) { if (!_follow) { FXP m = _vm->_eye->_z / (_pos3D._z - _vm->_eye->_z); _pos3D._x = (_vm->_eye->_x + (_vm->_eye->_x - _pos2D.x) / m); - _pos3D._x.round(); + _pos3D._x = _pos3D._x.round(); if (!_constY) { _pos3D._y = _vm->_eye->_y + (_vm->_eye->_y - _pos2D.y) / m; - _pos3D._y.round(); + _pos3D._y = _pos3D._y.round(); } } -- cgit v1.2.3 From 866baf1d9a3a1a463fc4fe83c287168291b865ac Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:26:23 +0100 Subject: LASTEXPRESS: Removing excess check --- engines/lastexpress/game/savegame.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'engines') diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp index d9f2993c17..e2682ba0d1 100644 --- a/engines/lastexpress/game/savegame.cpp +++ b/engines/lastexpress/game/savegame.cpp @@ -497,9 +497,6 @@ void SaveLoad::loadLastGame() { return; } - if (!_savegame) - error("[SaveLoad::loadGame] No savegame stream present"); - // Load the last entry _savegame->seek(header.offsetEntry); -- cgit v1.2.3 From a92ecf7b5388c03cd9e899645da2430caaf89e60 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:30:52 +0100 Subject: AGI: Removed excess check --- engines/agi/wagparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp index 0b49866531..54f8eaf90b 100644 --- a/engines/agi/wagparser.cpp +++ b/engines/agi/wagparser.cpp @@ -79,7 +79,7 @@ bool WagProperty::read(Common::SeekableReadStream &stream) { uint32 readBytes = stream.read(_propData, _propSize); // Read the data in _propData[_propSize] = 0; // Set the trailing zero for easy C-style string access - _readOk = (_propData != NULL && readBytes == _propSize); // Check that we got the whole data + _readOk = (readBytes == _propSize); // Check that we got the whole data return _readOk; } -- cgit v1.2.3 From 9033f8db13b117fd8a78142cb244835d99777310 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:41:39 +0100 Subject: MADS: Shut gcc warning. Requires checking --- engines/mads/phantom/game_phantom.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp index af2102b18f..27849cce1e 100644 --- a/engines/mads/phantom/game_phantom.cpp +++ b/engines/mads/phantom/game_phantom.cpp @@ -432,7 +432,7 @@ void GamePhantom::doObjectAction() { _vm->_dialogs->showItem(OBJ_BOOK, 815, 0); action._inProgress = false; return; - } + } if (action.isAction(VERB_LOOK, NOUN_CRUMPLED_NOTE) || action.isAction(VERB_READ, NOUN_CRUMPLED_NOTE)) { _vm->_dialogs->showItem(OBJ_CRUMPLED_NOTE, 816, 6); @@ -870,6 +870,10 @@ void GamePhantom::setupCatacombs() { _globals[kCatacombs501From] = 0; break; + case DIFFICULTY_MEDIUM: + // TODO: FIXME. Do we need to set something here? + break; + case DIFFICULTY_HARD: _catacombs = _hardCatacombs; _catacombSize = 62; @@ -924,7 +928,7 @@ void GamePhantom::newCatacombRoom(int toRoom, int fromExit) { default: error("Unexpected room in newCatacombRoom"); - } + } } else { newSceneNum = _catacombs[toRoom]._sceneNum; _globals[81] = _catacombs[toRoom]._flags; -- cgit v1.2.3 From 46dc9a89c3e876e88786b0f20bbcb9cf8acba5bb Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:41:59 +0100 Subject: MADS: Fix warning. Requires consulting with the original --- engines/mads/phantom/phantom_scenes1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 7bc9c179b9..c86d2852c7 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -6220,7 +6220,7 @@ void Scene110::actions() { if (_action.isAction(VERB_WALK_THROUGH, NOUN_RIGHT_DOOR) || _action.isAction(VERB_OPEN, NOUN_RIGHT_DOOR) || _action.isAction(VERB_UNLOCK, NOUN_RIGHT_DOOR) || _action.isAction(VERB_LOCK, NOUN_RIGHT_DOOR)) { - if ((_globals[kCurrentYear] == 1881) || (_globals[kDoneBrieConv203] >= 1) + if (((_globals[kCurrentYear] == 1881) || (_globals[kDoneBrieConv203] >= 1)) && !_action.isAction(VERB_UNLOCK, NOUN_RIGHT_DOOR) && !_action.isAction(VERB_LOCK, NOUN_RIGHT_DOOR)) { switch (_game._trigger) { case (0): -- cgit v1.2.3 From 98559576977aaf020739e596f9440e81aa7d06fa Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:44:20 +0100 Subject: MADS: Fixing parenthesis. Requires checking with the original --- engines/mads/phantom/phantom_scenes2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp index 1590d06549..eff0bf8db9 100644 --- a/engines/mads/phantom/phantom_scenes2.cpp +++ b/engines/mads/phantom/phantom_scenes2.cpp @@ -4580,9 +4580,9 @@ void Scene205::actions() { } if ((_action.isAction(VERB_ENTER)) || (_action.isAction(VERB_OPEN)) || _action.isAction(VERB_UNLOCK) || _action.isAction(VERB_LOCK)) { - if (((_action.isObject(NOUN_BOX_FIVE)) && ((_globals[kDoorsIn205] == 0) || (_globals[kDoorsIn205] == 2)) + if (((_action.isObject(NOUN_BOX_FIVE) && ((_globals[kDoorsIn205] == 0) || (_globals[kDoorsIn205] == 2))) || _action.isAction(VERB_UNLOCK) || _action.isAction(VERB_LOCK)) - || ((_action.isObject(NOUN_BOX_NINE)) && ((_globals[kDoorsIn205] == 0) || (_globals[kDoorsIn205] == 1))) + || ((_action.isObject(NOUN_BOX_NINE) && ((_globals[kDoorsIn205] == 0) || (_globals[kDoorsIn205] == 1)))) || (_action.isObject(NOUN_BOX_SIX)) || (_action.isObject(NOUN_BOX_SEVEN)) || (_action.isObject(NOUN_BOX_EIGHT))) { switch (_game._trigger) { case (0): -- cgit v1.2.3 From 8f3d528b7efba1b3c86a5a4934eae5ace78459a9 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:49:18 +0100 Subject: AGI: Better pointer checking --- engines/agi/words.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp index ff9049fdc5..438c1ce354 100644 --- a/engines/agi/words.cpp +++ b/engines/agi/words.cpp @@ -161,11 +161,13 @@ void AgiEngine::dictionaryWords(char *msg) { char *q = NULL; int wid, wlen; + assert(msg); + debugC(2, kDebugLevelScripts, "msg = \"%s\"", msg); cleanInput(); - for (p = msg; p && *p && getvar(vWordNotFound) == 0;) { + for (p = msg; *p && getvar(vWordNotFound) == 0;) { if (*p == 0x20) p++; @@ -205,7 +207,7 @@ void AgiEngine::dictionaryWords(char *msg) { break; } - if (p != NULL && *p) { + if (*p) { debugC(2, kDebugLevelScripts, "p = %s", p); *p = 0; p++; -- cgit v1.2.3 From 48e048be8d888c6c52140eeedac2742f5b1319cb Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:54:13 +0100 Subject: WINTERMUTE: More sanity checks --- engines/wintermute/ad/ad_game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp index 3c4383f55e..df0328ce5e 100644 --- a/engines/wintermute/ad/ad_game.cpp +++ b/engines/wintermute/ad/ad_game.cpp @@ -2261,7 +2261,7 @@ bool AdGame::onMouseRightUp() { bool AdGame::displayDebugInfo() { char str[100]; if (_gameRef->_debugDebugMode) { - sprintf(str, "Mouse: %d, %d (scene: %d, %d)", _mousePos.x, _mousePos.y, _mousePos.x + _scene->getOffsetLeft(), _mousePos.y + _scene->getOffsetTop()); + sprintf(str, "Mouse: %d, %d (scene: %d, %d)", _mousePos.x, _mousePos.y, _mousePos.x + (_scene ? _scene->getOffsetLeft() : 0), _mousePos.y + (_scene ? _scene->getOffsetTop() : 0)); _systemFont->drawText((byte *)str, 0, 90, _renderer->getWidth(), TAL_RIGHT); sprintf(str, "Scene: %s (prev: %s)", (_scene && _scene->getName()) ? _scene->getName() : "???", _prevSceneName ? _prevSceneName : "???"); -- cgit v1.2.3 From 401518a3dc4b55482fa28bfb066d8255454c39cc Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 22:57:23 +0100 Subject: WINTERMUTE: Proper place for pointer check --- engines/wintermute/base/file/base_save_thumb_file.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index acd5363e89..54f7ee7c62 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -70,11 +70,12 @@ bool BaseSaveThumbFile::open(const Common::String &filename) { delete[] tempFilename; BasePersistenceManager *pm = new BasePersistenceManager(); - Common::String slotFilename = pm->getFilenameForSlot(slot); if (!pm) { return STATUS_FAILED; } + Common::String slotFilename = pm->getFilenameForSlot(slot); + if (DID_FAIL(pm->initLoad(slotFilename))) { delete pm; return STATUS_FAILED; -- cgit v1.2.3 From a6ca2ec6d02bd7f5075ce1e1ffc15973d0da6970 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:02:30 +0100 Subject: ACCESS: Adding missing comma --- engines/access/resources.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp index c11dbf6331..096fb15b35 100644 --- a/engines/access/resources.cpp +++ b/engines/access/resources.cpp @@ -74,7 +74,7 @@ bool Resources::load(Common::String &errorMessage) { // Load in the data for the game load(f); - + return true; } @@ -147,7 +147,7 @@ uint Resources::findEntry(byte gameId, byte discType, byte demoType, Common::Lan Common::String Resources::readString(Common::SeekableReadStream &s) { Common::String result; char c; - + while ((c = s.readByte()) != 0) result += c; @@ -180,14 +180,14 @@ const byte INITIAL_PALETTE[18 * 3] = { const char *const GENERAL_MESSAGES[] = { "LOOKING THERE REVEALS NOTHING OF INTEREST.", // LOOK_MESSAGE "THAT DOESN'T OPEN.", // OPEN_MESSAGE - "THAT WON'T MOVE." // MOVE_MESSAGE + "THAT WON'T MOVE.", // MOVE_MESSAGE "YOU CAN'T TAKE THAT.", // GET_MESSAGE "THAT DOESN'T SEEM TO WORK.", // USE_MESSAGE "YOU CAN'T CLIMB THAT.", // GO_MESSAGE "THERE SEEMS TO BE NO RESPONSE.", // TALK_MESSAGE "THIS OBJECT REQUIRES NO HINTS", // HELP_MESSAGE "THIS OBJECT REQUIRES NO HINTS", // HELP_MESSAGE - "THAT DOESN'T SEEM TO WORK.", // USE_MESSAGE + "THAT DOESN'T SEEM TO WORK." // USE_MESSAGE }; const int INVCOORDS[][4] = { -- cgit v1.2.3 From 5675fa7b7fd751c0699cb944258e608e5ae68b74 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:07:02 +0100 Subject: SCUMM: Enforcing numbers to double --- engines/scumm/players/player_v2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/scumm/players/player_v2.cpp b/engines/scumm/players/player_v2.cpp index f0aaa4a3be..c7ebd8abff 100644 --- a/engines/scumm/players/player_v2.cpp +++ b/engines/scumm/players/player_v2.cpp @@ -77,7 +77,7 @@ void Player_V2::setMusicVolume (int vol) { vol = 255; /* scale to int16, FIXME: find best value */ - double out = vol * 128 / 3; + double out = vol * 128.0 / 3.0; /* build volume table (2dB per step) */ for (int i = 0; i < 15; i++) { -- cgit v1.2.3 From ccd82145a46607438fa395a3109d555e1097262d Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:08:50 +0100 Subject: HE: Proper cast to double to avoid integer division --- engines/scumm/he/logic/puttrace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/scumm/he/logic/puttrace.cpp b/engines/scumm/he/logic/puttrace.cpp index 1c3317b131..ba62c118fe 100644 --- a/engines/scumm/he/logic/puttrace.cpp +++ b/engines/scumm/he/logic/puttrace.cpp @@ -256,7 +256,7 @@ int32 LogicHErace::op_1102(int32 *args) { } int32 LogicHErace::op_1103(int32 *args) { - double angle = args[0] / args[1] * DEG2RAD; + double angle = (double)args[0] / (double)args[1] * DEG2RAD; writeScummVar(108, (int32)(sin(angle) * args[2])); writeScummVar(109, (int32)(cos(angle) * args[2])); -- cgit v1.2.3 From f1c982586303db745b034eb123d6f56c300de44c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 27 Nov 2015 17:52:57 -0500 Subject: ACCESS: Fix redrawing buttons after changing selection --- engines/access/room.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines') diff --git a/engines/access/room.cpp b/engines/access/room.cpp index 759af74cff..8a5526e310 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -706,6 +706,7 @@ void Room::executeCommand(int commandId) { delete iconData; // Draw the button as selected + roomMenu(); _vm->_screen->plotImage(spr, _selectCommand + 2, Common::Point(_rMouse[_selectCommand][0], (_vm->getGameID() == GType_MartianMemorandum) ? 184 : 176)); -- cgit v1.2.3 From 7a21929e08cf2b50b06ba9e7372f10b1d6a956b0 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:28:50 +0100 Subject: FULLPIPE: Fix cursor comparison --- engines/fullpipe/scenes/scene04.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index c0f0960aba..6c361d6f1a 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -238,7 +238,7 @@ int scene04_updateCursor() { } } - if (g_fp->_objectIdAtCursor == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC4_DOWNTRUBA) + if (g_fp->_cursorId == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC4_DOWNTRUBA) g_fp->_cursorId = PIC_CSR_GOD; return g_fp->_cursorId; -- cgit v1.2.3 From 34a1d7aaaadf0aae731d57e324955dfbcc3a9986 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:37:27 +0100 Subject: AGI: Improve debug output --- engines/agi/sound_2gs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp index b940eed762..b221afbc23 100644 --- a/engines/agi/sound_2gs.cpp +++ b/engines/agi/sound_2gs.cpp @@ -345,7 +345,7 @@ void SoundGen2GS::advanceMidiPlayer() { case MIDI_PITCH_WHEEL: parm1 = *p++; parm2 = *p++; - debugC(3, kDebugLevelSound, "channel %X: pitch wheel (unimplemented)", chn); + debugC(3, kDebugLevelSound, "channel %X: pitch wheel (unimplemented) %02X, %02X", chn, parm1, parm2); break; default: -- cgit v1.2.3 From b7735b020fa03219d96d3dce44b508d1da6dbc96 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 27 Nov 2015 23:59:56 +0100 Subject: TESTBED: Added safety check --- engines/testbed/testsuite.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines') diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp index 7729c4911b..853f1288b3 100644 --- a/engines/testbed/testsuite.cpp +++ b/engines/testbed/testsuite.cpp @@ -283,6 +283,9 @@ void Testsuite::execute() { pt.y += getLineSeparation(); int numEnabledTests = getNumTestsEnabled(); + if (!numEnabledTests) + return; + for (Common::Array::iterator i = _testsToExecute.begin(); i != _testsToExecute.end(); ++i) { if (!(*i)->enabled) { logPrintf("Info! Skipping Test: %s, Skipped by configuration.\n", ((*i)->featureName).c_str()); -- cgit v1.2.3 From deb7623fbff4b4d7c993facc4bec43a7509b6da4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 28 Nov 2015 00:03:49 +0100 Subject: SCUMM: Add safety check --- engines/scumm/dialogs.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines') diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index c22525b6f2..21c7428621 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -308,6 +308,8 @@ void HelpDialog::reflowLayout() { int16 x, y; uint16 w, h; + assert(lineHeight); + g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h); // Make sure than we don't have more lines than what we can fit -- cgit v1.2.3 From b9fc8cf746eb1ddadc3db4fd4630364826dab7d5 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 28 Nov 2015 00:18:32 +0100 Subject: TESTBED: Sanity check --- engines/testbed/testbed.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines') diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp index 635fd09bac..885429cafd 100644 --- a/engines/testbed/testbed.cpp +++ b/engines/testbed/testbed.cpp @@ -152,6 +152,9 @@ void TestbedEngine::invokeTestsuites(TestbedConfigManager &cfMan) { Common::Point pt = Testsuite::getDisplayRegionCoordinates(); int numSuitesEnabled = cfMan.getNumSuitesEnabled(); + if (!numSuitesEnabled) + return; + for (iter = _testsuiteList.begin(); iter != _testsuiteList.end(); iter++) { if (shouldQuit()) { return; -- cgit v1.2.3 From 4e415c3fefc3a724958209f01839edb6a2fe4e0f Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 27 Nov 2015 18:56:44 -0500 Subject: ACCESS: Fix loading character data in English demo --- engines/access/char.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/char.cpp b/engines/access/char.cpp index 76dfca6df0..3e95208fe5 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -31,7 +31,7 @@ CharEntry::CharEntry(const byte *data, AccessEngine *vm) { Common::MemoryReadStream s(data, 999); _charFlag = s.readByte(); - if (vm->getGameID() == GType_MartianMemorandum) { + if (vm->getGameID() != GType_Amazon || vm->isDemo()) { _screenFile.load(s); _estabIndex = s.readSint16LE(); } else { -- cgit v1.2.3 From e8aa00c9751c554e46bde5f74d0bab821d496a31 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 27 Nov 2015 19:13:36 -0500 Subject: ACCESS: Fix crash in demo when changing scene --- engines/access/scripts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 12328566fc..25b8c97be5 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -164,7 +164,7 @@ void Scripts::charLoop() { _sequence = 2000; searchForSequence(); _vm->_images.clear(); - _vm->_buffer2.blitFrom(_vm->_buffer1); + _vm->_buffer2.copyBlock(&_vm->_buffer1, Common::Rect(0, 0, _vm->_buffer2.w, _vm->_buffer2.h)); _vm->_newRects.clear(); executeScript(); -- cgit v1.2.3 From 7ce6a2d89accb2c1a146b8579d3c86f36471f48e Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Mon, 30 Nov 2015 19:17:13 +0100 Subject: ACCESS: video player: initialize variable also remove another unused variable --- engines/access/video/movie_decoder.cpp | 1 + engines/access/video/movie_decoder.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/video/movie_decoder.cpp b/engines/access/video/movie_decoder.cpp index b9e252d610..05ec25d54c 100644 --- a/engines/access/video/movie_decoder.cpp +++ b/engines/access/video/movie_decoder.cpp @@ -372,6 +372,7 @@ AccessVIDMovieDecoder::StreamVideoTrack::StreamVideoTrack(uint32 width, uint32 h _curFrame = -1; _nextFrameStartTime = 0; _endOfTrack = false; + _dirtyPalette = false; memset(&_palette, 0, sizeof(_palette)); diff --git a/engines/access/video/movie_decoder.h b/engines/access/video/movie_decoder.h index dc4a87720c..fe8a89fcde 100644 --- a/engines/access/video/movie_decoder.h +++ b/engines/access/video/movie_decoder.h @@ -143,7 +143,6 @@ private: private: int16 decodeSample(uint8 dataNibble); - uint32 _codecTag; uint16 _sampleRate; bool _stereo; }; -- cgit v1.2.3 From 1c841094fa68af4b2797d3f06d7ffbcffb8ac85a Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Mon, 30 Nov 2015 22:39:54 +0100 Subject: BBVS: Use memmove(), not memcpy(), for overlapping memory areas CID 1230310. This fixes the credits easter eggs for me. --- engines/bbvs/bbvs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp index 1d668f9c34..816b713b1f 100644 --- a/engines/bbvs/bbvs.cpp +++ b/engines/bbvs/bbvs.cpp @@ -1384,7 +1384,7 @@ void BbvsEngine::checkEasterEgg(char key) { }; if (_currSceneNum == kCredits) { - memcpy(&_easterEggInput[1], &_easterEggInput[0], 6); + memmove(&_easterEggInput[1], &_easterEggInput[0], 6); _easterEggInput[0] = key; for (int i = 0; i < ARRAYSIZE(kEasterEggStrings); ++i) { if (!scumm_strnicmp(kEasterEggStrings[i], _easterEggInput, kEasterEggLengths[i])) { -- cgit v1.2.3 From 7449c09f4a637bfb23b4507de70a7344c1a41860 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 30 Nov 2015 23:48:48 +0100 Subject: SWORD25: Init variables --- engines/sword25/gfx/animation.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines') diff --git a/engines/sword25/gfx/animation.cpp b/engines/sword25/gfx/animation.cpp index e2662fb2b3..541c44662b 100644 --- a/engines/sword25/gfx/animation.cpp +++ b/engines/sword25/gfx/animation.cpp @@ -119,6 +119,10 @@ void Animation::initMembers() { _animationResourcePtr = 0; _animationTemplateHandle = 0; _framesLocked = false; + + _loopPointCallback = 0; + _actionCallback = 0; + _deleteCallback = 0; } Animation::~Animation() { -- cgit v1.2.3 From 3a574272b83cadf175cfb50a42fef0a126116ac6 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 30 Nov 2015 23:54:09 +0100 Subject: SWORD25: Remove unused class variable --- engines/sword25/gfx/graphicengine.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines') diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h index cf4289b8bb..cca87b491c 100644 --- a/engines/sword25/gfx/graphicengine.h +++ b/engines/sword25/gfx/graphicengine.h @@ -310,8 +310,6 @@ private: uint _frameTimeSampleSlot; private: - byte *_backBuffer; - RenderObjectPtr _mainPanelPtr; Common::ScopedPtr _renderObjectManagerPtr; -- cgit v1.2.3 From 2e3ecb1be89e7744f1a4dff6309404f0833407ec Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 1 Dec 2015 20:23:29 -0500 Subject: SHERLOCK: SS: Fix crash moving box at Tabbacconists --- engines/sherlock/talk.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines') diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index e9c52276f6..b239fd9fb7 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -994,6 +994,10 @@ OpcodeReturn Talk::cmdAdjustObjectSequence(const byte *&str) { _seqCount = str[1]; str += (str[0] & 127) + 2; + // WORKAROUND: Original German Scalpel crash when moving box at Tobacconists + if (_vm->getLanguage() == Common::DE_DEU && _scriptName == "Alfr30Z") + _seqCount = 16; + // Copy in the new sequence for (int idx = 0; idx < _seqCount; ++idx, ++str) scene._bgShapes[objId]._sequences[idx] = str[0] - 1; -- cgit v1.2.3 From bf4ab6d52af065b424ec29e1fb8205527af5a060 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 1 Dec 2015 21:48:14 -0500 Subject: TINSEL: Remove redundant assert check in SetHookScene In the original, a second SetHookScene call can validly occur due to first placing the cover-switched book in the bookcase, and then by the thief leaving if his arrival happens immediately. --- engines/tinsel/tinsel.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines') diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 6dc8e3bb35..77932a5cdf 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -528,8 +528,6 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition) { * Store a scene as hooked */ void SetHookScene(SCNHANDLE scene, int entrance, int transition) { - assert(g_HookScene.scene == 0); // scene already hooked - g_HookScene.scene = scene; g_HookScene.entry = entrance; g_HookScene.trans = transition; -- cgit v1.2.3 From 427850b78dc4cf6cf7d6c8a666ba9f9b45c39dfb Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 2 Dec 2015 11:41:55 +0100 Subject: VOYEUR: Remove useless global variable --- engines/voyeur/voyeur.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines') diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index dad634c9bb..cbb6846340 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -33,8 +33,6 @@ namespace Voyeur { -VoyeurEngine *g_vm; - VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc), _randomSource("Voyeur"), _defaultFontInfo(3, 0xff, 0xff, 0, 0, ALIGN_LEFT, 0, Common::Point(), 1, 1, -- cgit v1.2.3 From a6a9315d6e0db500d9be2508b038b84cb6d4bc98 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 2 Dec 2015 21:13:12 -0500 Subject: ACCESS: Fix corruption of scrolling screen when using ui buttons --- engines/access/room.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/access/room.cpp b/engines/access/room.cpp index 8a5526e310..9a6efd32fc 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -611,6 +611,7 @@ void Room::handleCommand(int commandId) { void Room::executeCommand(int commandId) { EventsManager &events = *_vm->_events; + Screen &screen = *_vm->_screen; _selectCommand = commandId; if (_vm->getGameID() == GType_MartianMemorandum) { @@ -697,8 +698,8 @@ void Room::executeCommand(int commandId) { break; } } - _vm->_screen->saveScreen(); - _vm->_screen->setDisplayScan(); + screen.saveScreen(); + screen.setDisplayScan(); // Get the toolbar icons resource Resource *iconData = _vm->_files->loadFile("ICONS.LZ"); @@ -706,8 +707,9 @@ void Room::executeCommand(int commandId) { delete iconData; // Draw the button as selected - roomMenu(); - _vm->_screen->plotImage(spr, _selectCommand + 2, + screen.plotImage(spr, 0, Common::Point(0, 177)); + screen.plotImage(spr, 1, Common::Point(143, 177)); + screen.plotImage(spr, _selectCommand + 2, Common::Point(_rMouse[_selectCommand][0], (_vm->getGameID() == GType_MartianMemorandum) ? 184 : 176)); _vm->_screen->restoreScreen(); -- cgit v1.2.3 From cc497fb8dcd6bfb3de1d8844b8d25a0783ae0aac Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 2 Dec 2015 21:49:56 -0500 Subject: ACCESS: Explicit cast in figuring out fade out pixel values --- engines/access/screen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index 364b0a7eef..e6d43d0156 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -181,7 +181,7 @@ void Screen::forceFadeOut() { int v = *srcP; if (v) { repeatFlag = true; - *srcP = MAX(*srcP - FADE_AMOUNT, 0); + *srcP = MAX((int)*srcP - FADE_AMOUNT, 0); } } -- cgit v1.2.3 From 1779fba59bb94b136be640834036df0f67881319 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 4 Dec 2015 11:52:46 +0100 Subject: SWORD25: Mark Sword 2.5 as testing --- engines/sword25/detection_tables.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'engines') diff --git a/engines/sword25/detection_tables.h b/engines/sword25/detection_tables.h index 644b8ef366..b58f430fcf 100644 --- a/engines/sword25/detection_tables.h +++ b/engines/sword25/detection_tables.h @@ -29,7 +29,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("data.b25c", "f8b6e03ada2d2f6cf27fbc11ad1572e9", 654310588), Common::EN_ANY, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -38,7 +38,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_fr.b25c", "690caf157387e06d2c3d1ca53c43f428", 1006043), Common::FR_FRA, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -47,7 +47,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("data.b25c", "f8b6e03ada2d2f6cf27fbc11ad1572e9", 654310588), Common::DE_DEU, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -56,7 +56,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_hr.b25c", "e881054d1f8ec1e527422fc521c25405", 1273217), Common::HR_HRV, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -65,7 +65,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_it.b25c", "f3325666da0515cc2b42062e953c0889", 996197), Common::IT_ITA, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -74,7 +74,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_pl.b25c", "49dc1a20f95391a808e475c49be2bac0", 1281799), Common::PL_POL, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -83,7 +83,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_pt.b25c", "1df701432f9e13dcefe1adeb890b9c69", 993812), Common::PT_BRA, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -92,7 +92,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_ru.b25c", "deb33dd2f90a71ff60181918a8ce5063", 1235378), Common::RU_RUS, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, { @@ -101,7 +101,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_es.b25c", "384c19072d83725f351bb9ecb4d3f02b", 987965), Common::ES_ESP, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, // Hungarian "psylog" version. @@ -112,7 +112,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("lang_hu.b25c", "7de51a3b4926a192549e75b1a7d81667", 1864915), Common::HU_HUN, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, @@ -126,7 +126,7 @@ static const ADGameDescription gameDescriptions[] = { AD_LISTEND}, Common::EN_ANY, Common::kPlatformUnknown, - GF_EXTRACTED | ADGF_UNSTABLE, + GF_EXTRACTED | ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, @@ -138,7 +138,7 @@ static const ADGameDescription gameDescriptions[] = { AD_ENTRY1s("data.b25c", "880a8a67faf4a4e7ab62cf114b771428", 827397764), Common::EN_ANY, Common::kPlatformUnknown, - ADGF_UNSTABLE, + ADGF_TESTING, GUIO1(GUIO_NOASPECT) }, -- cgit v1.2.3 From e215a75e7b314176fccb2b386db72a285d1af3fa Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 5 Dec 2015 08:03:36 +0100 Subject: AGI: stub for AGI1 newRoom() --- engines/agi/cycle.cpp | 20 +++++++++++++++----- engines/agi/op_cmd.cpp | 16 ---------------- engines/agi/opcodes.cpp | 4 ++-- engines/agi/opcodes.h | 2 -- 4 files changed, 17 insertions(+), 25 deletions(-) (limited to 'engines') diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp index 6b34605364..145b827160 100644 --- a/engines/agi/cycle.cpp +++ b/engines/agi/cycle.cpp @@ -84,13 +84,23 @@ void AgiEngine::newRoom(int n) { break; } - _game.vars[vBorderTouchEgo] = 0; - setflag(fNewRoomExec, true); + if (getVersion() < 0x2000) { + warning("STUB: NewRoom(%d)", n); - _game.exitAllLogics = true; + v->flags &= ~fDidntMove; + // animateObject(0); + agiLoadResource(rVIEW, _game.viewTable[0].currentView); + setView(&_game.viewTable[0], _game.viewTable[0].currentView); - writeStatus(); - writePrompt(); + } else { + _game.vars[vBorderTouchEgo] = 0; + setflag(fNewRoomExec, true); + + _game.exitAllLogics = true; + + writeStatus(); + writePrompt(); + } } void AgiEngine::resetControllers() { diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index 662454f3c1..bf2a2ed77b 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -1711,22 +1711,6 @@ void cmdCallV1(AgiGame *state, uint8 *p) { _v[13] = 1; } -void cmdNewRoomV1(AgiGame *state, uint8 *p) { - warning("cmdNewRoomV1()"); - state->_vm->agiLoadResource(rLOGIC, p0); - state->max_logics = 1; - state->logic_list[1] = p0; - _v[13] = 1; -} - -void cmdNewRoomVV1(AgiGame *state, uint8 *p) { - warning("cmdNewRoomVV1()"); - state->_vm->agiLoadResource(rLOGIC, _v[p0]); - state->max_logics = 1; - state->logic_list[1] = _v[p0]; - _v[13] = 1; -} - void cmdUnknown(AgiGame *state, uint8 *p) { warning("Skipping unknown opcode %2X", *(code + ip - 1)); } diff --git a/engines/agi/opcodes.cpp b/engines/agi/opcodes.cpp index 621fbb8e82..0d7d180ec9 100644 --- a/engines/agi/opcodes.cpp +++ b/engines/agi/opcodes.cpp @@ -60,7 +60,7 @@ AgiInstruction insV1[] = { { "subv", "vv", &cmdSubV }, // 08 { "load.view", "n", &cmdLoadView }, // 09 { "animate.obj", "n", &cmdAnimateObj }, // 0A - { "new.room", "n", &cmdNewRoomV1 }, // 0B + { "new.room", "n", &cmdNewRoom }, // 0B { "draw.pic", "v", &cmdDrawPicV1 }, // 0C { "print", "s", &cmdPrint }, // 0D TODO { "status", "", &cmdStatus }, // 0E TODO @@ -112,7 +112,7 @@ AgiInstruction insV1[] = { { "set.v", "v", &cmdSetV }, // 3C { "reset.v", "v", &cmdResetV }, // 3D { "toggle.v", "v", &cmdToggleV }, // 3E - { "new.room.v", "v", &cmdNewRoomVV1 }, // 3F TODO + { "new.room.v", "v", &cmdNewRoom }, // 3F { "call", "n", &cmdCallV1 }, // 40 TODO { "quit", "", &cmdQuitV1 }, // 41 { "set.speed", "v", &cmdSetSpeed }, // 42 diff --git a/engines/agi/opcodes.h b/engines/agi/opcodes.h index 6bd31c339a..5466bc6ee0 100644 --- a/engines/agi/opcodes.h +++ b/engines/agi/opcodes.h @@ -237,8 +237,6 @@ void cmdAdjEgoMoveToXY(AgiGame *state, uint8 *p); void cmdSetSpeed(AgiGame *state, uint8 *p); void cmdSetItemView(AgiGame *state, uint8 *p); void cmdCallV1(AgiGame *state, uint8 *p); -void cmdNewRoomV1(AgiGame *state, uint8 *p); -void cmdNewRoomVV1(AgiGame *state, uint8 *p); void cmdUnknown(AgiGame *state, uint8 *p); void condEqual(AgiGame *state, uint8 *p); -- cgit v1.2.3 From 93f631e3feefd5fea2f9144d74c563d07f99a5da Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Sun, 6 Dec 2015 17:17:19 +0100 Subject: AGI: Remove unused variable --- engines/agi/console.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'engines') diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp index 7995938d99..89838b3be9 100644 --- a/engines/agi/console.cpp +++ b/engines/agi/console.cpp @@ -143,7 +143,6 @@ bool Console::Cmd_Version(int argc, const char **argv) { const char *wordScanPtr = NULL; const char *wordStartPtr = NULL; const char *versionStartPtr = NULL; - const char *versionPtr = NULL; int wordLen = 0; char curChar = 0; int versionLen = 0; @@ -179,7 +178,6 @@ bool Console::Cmd_Version(int argc, const char **argv) { // Now scan this text for version information wordScanPtr = scriptTextPtr; - versionPtr = NULL; do { curChar = *wordScanPtr; -- cgit v1.2.3 From 4c265a2354928aa8dac0fa991b2bf7c4c841c89f Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 6 Dec 2015 15:23:49 -0500 Subject: ACCESS: Fix crash on Darlene's 'I Told You No' sample --- engines/access/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index b3317cee5f..5fb971188a 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -109,7 +109,7 @@ void SoundManager::playSound(Resource *res, int priority, bool loop) { byte internalSampleRate = resourceData[5]; int sampleSize = READ_LE_UINT16(resourceData + 7); - assert( (sampleSize + 32) == res->_size); + assert( (sampleSize + 32) <= res->_size); int sampleRate = 0; switch (internalSampleRate) { -- cgit v1.2.3 From b2be23ba42bf0e8694d2b335ba7ee3619fcff1b2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 6 Dec 2015 16:20:24 -0500 Subject: ACCESS: Fix character loading for floppy version --- engines/access/char.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/char.cpp b/engines/access/char.cpp index 3e95208fe5..2afb81db30 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -31,7 +31,7 @@ CharEntry::CharEntry(const byte *data, AccessEngine *vm) { Common::MemoryReadStream s(data, 999); _charFlag = s.readByte(); - if (vm->getGameID() != GType_Amazon || vm->isDemo()) { + if (vm->getGameID() != GType_Amazon || !vm->isCD()) { _screenFile.load(s); _estabIndex = s.readSint16LE(); } else { -- cgit v1.2.3 From ade912da56f2263a1ae6e97555dae9dd820489f3 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sun, 6 Dec 2015 22:31:29 +0100 Subject: SWORD25: Build engine by default --- engines/sword25/configure.engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sword25/configure.engine b/engines/sword25/configure.engine index 1729bbeb33..6a9428c758 100644 --- a/engines/sword25/configure.engine +++ b/engines/sword25/configure.engine @@ -1,3 +1,3 @@ # This file is included from the main "configure" script # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] -add_engine sword25 "Broken Sword 2.5" no "" "" "png zlib 16bit" +add_engine sword25 "Broken Sword 2.5" yes "" "" "png zlib 16bit" -- cgit v1.2.3 From 7dfc16aa349ad73c0b81f7d0a0178875bd7bc233 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 6 Dec 2015 18:00:09 -0500 Subject: ACCESS: Prevent scenes being briefly shown before fading in --- engines/access/screen.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engines') diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index e6d43d0156..b46f31f65a 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -89,6 +89,9 @@ void Screen::setPanel(int num) { } void Screen::updateScreen() { + if (_vm->_startup > 0) + return; + // Merge the dirty rects mergeDirtyRects(); -- cgit v1.2.3 From 7820bd5aed9d19fe09b910d1e6cc7ae1aa010631 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 6 Dec 2015 21:56:28 -0500 Subject: ACCESS: Prevent multiple copies of the same sound being queued --- engines/access/sound.cpp | 31 ++++++++++++++++++++++--------- engines/access/sound.h | 13 +++++++++++-- 2 files changed, 33 insertions(+), 11 deletions(-) (limited to 'engines') diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index 5fb971188a..38f544de4e 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -51,11 +51,20 @@ void SoundManager::clearSounds() { _mixer->stopHandle(_effectsHandle); while (_queue.size()) { - delete _queue[0]; + delete _queue[0]._stream; _queue.remove_at(0); } } +bool SoundManager::isSoundQueued(int soundId) const { + for (uint idx = 0; idx < _queue.size(); ++idx) { + if (_queue[idx]._soundId == soundId) + return true; + } + + return false; +} + void SoundManager::loadSoundTable(int idx, int fileNum, int subfile, int priority) { debugC(1, kDebugSound, "loadSoundTable(%d, %d, %d)", idx, fileNum, subfile); @@ -77,12 +86,15 @@ Resource *SoundManager::loadSound(int fileNum, int subfile) { void SoundManager::playSound(int soundIndex, bool loop) { debugC(1, kDebugSound, "playSound(%d, %d)", soundIndex, loop); + if (isSoundQueued(soundIndex)) + // Prevent duplicate copies of a sound from being queued + return; int priority = _soundTable[soundIndex]._priority; - playSound(_soundTable[soundIndex]._res, priority, loop); + playSound(_soundTable[soundIndex]._res, priority, loop, soundIndex); } -void SoundManager::playSound(Resource *res, int priority, bool loop) { +void SoundManager::playSound(Resource *res, int priority, bool loop, int soundIndex) { debugC(1, kDebugSound, "playSound"); byte *resourceData = res->data(); @@ -139,14 +151,15 @@ void SoundManager::playSound(Resource *res, int priority, bool loop) { error("Unknown format"); if (loop) { - _queue.push_back(new Audio::LoopingAudioStream(audioStream, 0, DisposeAfterUse::NO)); + _queue.push_back(QueuedSound(new Audio::LoopingAudioStream(audioStream, 0, + DisposeAfterUse::NO), soundIndex)); } else { - _queue.push_back(audioStream); + _queue.push_back(QueuedSound(audioStream, soundIndex)); } if (!_mixer->isSoundHandleActive(_effectsHandle)) _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, - _queue[0], -1, _mixer->kMaxChannelVolume, 0, + _queue[0]._stream, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); } @@ -156,12 +169,12 @@ void SoundManager::checkSoundQueue() { if (_queue.empty() || _mixer->isSoundHandleActive(_effectsHandle)) return; - delete _queue[0]; + delete _queue[0]._stream; _queue.remove_at(0); - if (_queue.size() && _queue[0]) + if (_queue.size() && _queue[0]._stream) _mixer->playStream(Audio::Mixer::kSFXSoundType, &_effectsHandle, - _queue[0], -1, _mixer->kMaxChannelVolume, 0, + _queue[0]._stream, -1, _mixer->kMaxChannelVolume, 0, DisposeAfterUse::NO); } diff --git a/engines/access/sound.h b/engines/access/sound.h index e11a6b9730..b372e566d2 100644 --- a/engines/access/sound.h +++ b/engines/access/sound.h @@ -45,15 +45,24 @@ struct SoundEntry { }; class SoundManager { + struct QueuedSound { + Audio::AudioStream *_stream; + int _soundId; + + QueuedSound() : _stream(nullptr), _soundId(-1) {} + QueuedSound(Audio::AudioStream *stream, int soundId) : _stream(stream), _soundId(soundId) {} + }; private: AccessEngine *_vm; Audio::Mixer *_mixer; Audio::SoundHandle _effectsHandle; - Common::Array _queue; + Common::Array _queue; void clearSounds(); - void playSound(Resource *res, int priority, bool loop); + void playSound(Resource *res, int priority, bool loop, int soundIndex = -1); + + bool isSoundQueued(int soundId) const; public: Common::Array _soundTable; bool _playingSound; -- cgit v1.2.3 From 407a5a1f55060b85e6743db53223e610e6e4184c Mon Sep 17 00:00:00 2001 From: Jakub Wilk Date: Wed, 9 Dec 2015 23:02:01 +0100 Subject: SWORD25: Fix typo --- engines/sword25/math/polygon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sword25/math/polygon.cpp b/engines/sword25/math/polygon.cpp index ccefa1901e..99a0d37ed7 100644 --- a/engines/sword25/math/polygon.cpp +++ b/engines/sword25/math/polygon.cpp @@ -110,7 +110,7 @@ bool Polygon::computeIsCW() const { // Cross product form // If the cross product of the vertex lying fartherest bottom left is positive, - // the vertecies arrranged in a clockwise order. Otherwise counter-clockwise + // the vertecies arranged in a clockwise order. Otherwise counter-clockwise if (crossProduct(vertices[v1Index], vertices[v2Index], vertices[v3Index]) >= 0) return true; } -- cgit v1.2.3 From c8acaff52146e6b88cd82c344252c14faf985ba9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 9 Dec 2015 21:44:08 -0500 Subject: SHERLOCK: Add validation for journal entry values --- engines/sherlock/journal.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp index e443b6f727..c4aaa07a73 100644 --- a/engines/sherlock/journal.cpp +++ b/engines/sherlock/journal.cpp @@ -715,6 +715,15 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) { return; } + // Do a bit of validation here + assert(converseNum >= 0 && converseNum < (int)_directory.size()); + const Common::String &dirFilename = _directory[converseNum]; + Common::String locStr(dirFilename.c_str() + 4, dirFilename.c_str() + 6); + int newLocation = atoi(locStr.c_str()); + assert(newLocation >= 1 && newLocation <= (int)_locations.size()); + assert(!_locations[newLocation - 1].empty()); + assert(statementNum >= 0 && statementNum < (int)_vm->_talk->_statements.size()); + // Record the entry into the list _journal.push_back(JournalEntry(converseNum, statementNum, replyOnly)); _index = _journal.size() - 1; @@ -726,7 +735,7 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) { _index = saveIndex; _sub = saveSub; - // If new lines were added to the ournal, update the total number of lines + // If new lines were added to the journal, update the total number of lines // the journal continues if (!_lines.empty()) { _maxPage += _lines.size(); -- cgit v1.2.3 From f857859041e15d36a88e7843d289024962ddb1b1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 10 Dec 2015 20:20:51 -0500 Subject: ACCESS: Fix showing inventory after loading a close-up savegame --- engines/access/asurface.cpp | 7 +++++++ engines/access/asurface.h | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp index abae6bf703..cb51431657 100644 --- a/engines/access/asurface.cpp +++ b/engines/access/asurface.cpp @@ -294,6 +294,13 @@ void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) { copyRectToSurface(*src, bounds.left, bounds.top, bounds); } +void ASurface::copyTo(ASurface *dest) { + if (dest->empty()) + dest->create(this->w, this->h); + + dest->blitFrom(*this); +} + void ASurface::saveBlock(const Common::Rect &bounds) { _savedBounds = bounds; _savedBounds.clip(Common::Rect(0, 0, this->w, this->h)); diff --git a/engines/access/asurface.h b/engines/access/asurface.h index ce9928c00e..dd05c8067b 100644 --- a/engines/access/asurface.h +++ b/engines/access/asurface.h @@ -63,6 +63,8 @@ public: void create(uint16 width, uint16 height); + bool empty() const { return w == 0 || h == 0 || pixels == nullptr; } + void clearBuffer(); bool clip(Common::Rect &r); @@ -113,7 +115,7 @@ public: virtual void addDirtyRect(const Common::Rect &r) {} - void copyTo(ASurface *dest) { dest->blitFrom(*this); } + void copyTo(ASurface *dest); void saveBlock(const Common::Rect &bounds); -- cgit v1.2.3 From e6f3b9d29f0fc695a616323be133f579c309388b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 10 Dec 2015 22:28:59 -0500 Subject: ACCESS: Workaround for bad floppy English anim for librarian --- engines/access/animation.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'engines') diff --git a/engines/access/animation.cpp b/engines/access/animation.cpp index 14d7c0d4cc..259396f37e 100644 --- a/engines/access/animation.cpp +++ b/engines/access/animation.cpp @@ -53,6 +53,13 @@ Animation::Animation(AccessEngine *vm, Common::SeekableReadStream *stream) : Man uint32 startOfs = stream->pos(); _type = stream->readByte(); + + // WORKAROUND: In Amazon floppy English, there's an animation associated with + // the librarian that isn't used, and has junk data. Luckily, it's animation + // type is also invalid, so if the _type isn't in range, exit immediately + if (_type < 0 || _type > 7) + return; + _scaling = stream->readSByte(); stream->readByte(); // unk _frameNumber = stream->readByte(); -- cgit v1.2.3 From 7b671f42bca024e628ba2a2c1559c88cfc3eb6ba Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 10 Dec 2015 22:37:56 -0500 Subject: ACCESS: Fix crash when talking to Librarian --- engines/access/bubble_box.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'engines') diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp index df8adc1bc6..831ba507a1 100644 --- a/engines/access/bubble_box.cpp +++ b/engines/access/bubble_box.cpp @@ -95,8 +95,9 @@ void BubbleBox::placeBubble1(const Common::String &msg) { void BubbleBox::calcBubble(const Common::String &msg) { // Save points - Common::Point printOrg = _vm->_screen->_printOrg; - Common::Point printStart = _vm->_screen->_printStart; + Screen &screen = *_vm->_screen; + Common::Point printOrg = screen._printOrg; + Common::Point printStart = screen._printStart; // Figure out maximum width allowed if (_type == kBoxTypeFileDialog) { @@ -114,15 +115,15 @@ void BubbleBox::calcBubble(const Common::String &msg) { int width = 0; bool lastLine; do { - lastLine = _vm->_fonts._font2.getLine(s, _vm->_screen->_maxChars * 6, line, width); + lastLine = _vm->_fonts._font2.getLine(s, screen._maxChars * 6, line, width); _vm->_fonts._printMaxX = MAX(width, _vm->_fonts._printMaxX); - _vm->_screen->_printOrg.y += 6; - _vm->_screen->_printOrg.x = _vm->_screen->_printStart.x; + screen._printOrg.y += 6; + screen._printOrg.x = screen._printStart.x; } while (!lastLine); if (_type == kBoxTypeFileDialog) - ++_vm->_screen->_printOrg.y += 6; + ++screen._printOrg.y += 6; // Determine the width for the area width = (((_vm->_fonts._printMaxX >> 4) + 1) << 4) + 5; @@ -131,7 +132,7 @@ void BubbleBox::calcBubble(const Common::String &msg) { bounds.setWidth(width); // Determine the height for area - int y = _vm->_screen->_printOrg.y + 6; + int y = screen._printOrg.y + 6; if (_type == kBoxTypeFileDialog) y += 6; int height = y - bounds.top; @@ -141,6 +142,9 @@ void BubbleBox::calcBubble(const Common::String &msg) { if (height >= 0) bounds.setHeight(bounds.height() + 13 - (height % 13)); + if (bounds.bottom > screen.h) + bounds.translate(0, screen.h - bounds.bottom); + // Add the new bounds to the bubbles list _bubbles.push_back(bounds); -- cgit v1.2.3 From 642928f6c9030b2c744793a1c03f988cc52e85a3 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 10 Dec 2015 23:05:24 -0500 Subject: ACCESS: Fix clearing speech bubbles that overlap the response buttons --- engines/access/char.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines') diff --git a/engines/access/char.cpp b/engines/access/char.cpp index 2afb81db30..cbe1d5d3d9 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -164,6 +164,10 @@ void CharManager::charMenu() { } else error("Game not supported"); + // Make a backup copy of the screen including the character buttons, + // for restoring when erasing conversation boxes + screen.copyTo(&_vm->_buffer1); + screen.restoreScreen(); delete spr; } -- cgit v1.2.3 From 9b848dc7bd48d7e1088b4fe2f26ea863aea3396d Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 11 Dec 2015 21:36:40 -0500 Subject: ACCESS: Add a constant for transparency --- engines/access/asurface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp index cb51431657..f693e6a3a0 100644 --- a/engines/access/asurface.cpp +++ b/engines/access/asurface.cpp @@ -28,6 +28,8 @@ namespace Access { +const int TRANSPARENCY = 0; + SpriteResource::SpriteResource(AccessEngine *vm, Resource *res) { Common::Array offsets; int count = res->_stream->readUint16LE(); @@ -64,7 +66,7 @@ SpriteFrame::SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, i // Empty surface byte *data = (byte *)getPixels(); - Common::fill(data, data + w * h, 0); + Common::fill(data, data + w * h, TRANSPARENCY); // Decode the data for (int y = 0; y < h; ++y) { @@ -202,7 +204,7 @@ void ASurface::transBlitFrom(ASurface *src, const Common::Point &destPos) { byte *destP = (byte *)getBasePtr(destPos.x, destPos.y + yp); for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) { - if (*srcP != 0) + if (*srcP != TRANSPARENCY) *destP = *srcP; } } -- cgit v1.2.3 From 95ac0214aea59b777d61367a101dc7d932280d34 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 11 Dec 2015 21:37:42 -0500 Subject: ACCESS: Fix palette for inventory window --- engines/access/inventory.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines') diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp index d4a869be28..0a962aa69a 100644 --- a/engines/access/inventory.cpp +++ b/engines/access/inventory.cpp @@ -120,6 +120,7 @@ int InventoryManager::newDisplayInv() { getList(); initFields(); + files._setPaletteFlag = false; files.loadScreen(&_vm->_buffer1, 99, 0); _vm->_buffer1.copyTo(&_vm->_buffer2); _vm->copyBF2Vid(); -- cgit v1.2.3 From d4bbf4d2503f7d89094db64e85e6bd5c4c2b38e8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 11 Dec 2015 22:42:18 -0500 Subject: ACCESS: Fix differences in floppy chapter changes --- engines/access/amazon/amazon_game.cpp | 36 +++++++++++++++++--------------- engines/access/amazon/amazon_scripts.cpp | 17 +++++++++++++++ engines/access/scripts.h | 2 +- 3 files changed, 37 insertions(+), 18 deletions(-) (limited to 'engines') diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp index cf90beae96..3bb19676e8 100644 --- a/engines/access/amazon/amazon_game.cpp +++ b/engines/access/amazon/amazon_game.cpp @@ -640,25 +640,27 @@ void AmazonEngine::startChapter(int chapter) { _room->init4Quads(); } - if (chapter == 14) { - _conversation = 31; - _char->loadChar(_conversation); - _events->setCursor(CURSOR_ARROW); - - _images.clear(); - _oldRects.clear(); - _scripts->_sequence = 0; - _scripts->searchForSequence(); + if (isCD()) { + if (chapter == 14) { + _conversation = 31; + _char->loadChar(_conversation); + _events->setCursor(CURSOR_ARROW); + + _images.clear(); + _oldRects.clear(); + _scripts->_sequence = 0; + _scripts->searchForSequence(); + + if (_screen->_vesaMode) { + _converseMode = 1; + } + } else if (chapter != 1) { + _player->_roomNumber = CHAPTER_JUMP[_chapter - 1]; + _room->_function = FN_CLEAR1; + _converseMode = 0; - if (_screen->_vesaMode) { - _converseMode = 1; + _scripts->cmdRetPos(); } - } else if (chapter != 1) { - _player->_roomNumber = CHAPTER_JUMP[_chapter - 1]; - _room->_function = FN_CLEAR1; - _converseMode = 0; - - _scripts->cmdRetPos(); } } diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index 9ff6a2952d..48438e9c95 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -473,12 +473,29 @@ void AmazonScripts::cmdCycleBack() { if (_vm->_startup == -1) _vm->_screen->cyclePaletteBackwards(); } + void AmazonScripts::cmdChapter() { + Resource *activeScript = nullptr; + if (_vm->isDemo()) { cmdSetHelp(); } else { int chapter = _data->readByte(); + + if (!_vm->isCD()) { + // For floppy version, the current script remains active even + // after the end of the chapter start, so we need to save it + activeScript = _resource; + _resource = nullptr; + _data = nullptr; + } + _game->startChapter(chapter); + + if (!_vm->isCD()) { + assert(!_resource); + setScript(activeScript, false); + } } } diff --git a/engines/access/scripts.h b/engines/access/scripts.h index 07fd6acfb1..4cfedf3b3f 100644 --- a/engines/access/scripts.h +++ b/engines/access/scripts.h @@ -39,13 +39,13 @@ typedef void(Scripts::*ScriptMethodPtr)(); class Scripts : public Manager { private: - Resource *_resource; int _specialFunction; void clearWatch(); void printWatch(); protected: + Resource *_resource; Common::SeekableReadStream *_data; ScriptMethodPtr COMMAND_LIST[100]; -- cgit v1.2.3 From 355420c1e599e3b8f56116d4c7826c640f8cc8ac Mon Sep 17 00:00:00 2001 From: Strangerke Date: Sat, 12 Dec 2015 16:03:55 +0100 Subject: TONY: Add detection for Tony Tough Czech "not installed" --- engines/tony/detection_tables.h | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h index 28dcaac752..1bb91a862d 100644 --- a/engines/tony/detection_tables.h +++ b/engines/tony/detection_tables.h @@ -24,7 +24,7 @@ namespace Tony { static const TonyGameDescription gameDescriptions[] = { { - // Tony Tough English + // Tony Tough English not installed { "tony", 0, @@ -32,8 +32,6 @@ static const TonyGameDescription gameDescriptions[] = { // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized. // Is it perhaps because the Agos engine also has detection entries for data1.cab? {"data1.cab", 0, "ce82907242166bfb594d97bdb68f96d2", 4350}, - /*{"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071}, - {"roasted.mpc", 0, "57c4a3860cf899443c357e0078ea6f49", 366773},*/ AD_LISTEND }, Common::EN_ANY, @@ -43,6 +41,24 @@ static const TonyGameDescription gameDescriptions[] = { }, }, + { + // Tony Tough Czech not installed + { + "tony", + 0, + { + // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized. + // Is it perhaps because the Agos engine also has detection entries for data1.cab? + {"data1.cab", 0, "c6d5dd8f0c1241a6e3f7861b7f27bf7b", 4350}, + AD_LISTEND + }, + Common::CZ_CZE, + Common::kPlatformWindows, + ADGF_NO_FLAGS, + GUIO1(GUIO_NONE) + }, + }, + { // Tony Tough English Demo { -- cgit v1.2.3 From 77feb41a06ecbcee55ea857c14bb34cc5b13ff92 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 12 Dec 2015 20:53:42 -0500 Subject: ACCESS: Fix offering items to boat captain --- engines/access/inventory.cpp | 1 - engines/access/room.cpp | 4 +++- engines/access/screen.cpp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp index 0a962aa69a..6d1b6d8d0f 100644 --- a/engines/access/inventory.cpp +++ b/engines/access/inventory.cpp @@ -183,7 +183,6 @@ int InventoryManager::newDisplayInv() { _invModeFlag = false; events.debounceLeft(); _vm->_timers.restoreTimers(); - _vm->_startup = 1; int result = 0; if (!_invRefreshFlag) { diff --git a/engines/access/room.cpp b/engines/access/room.cpp index 9a6efd32fc..f54b6170bc 100644 --- a/engines/access/room.cpp +++ b/engines/access/room.cpp @@ -172,12 +172,14 @@ void Room::doRoom() { reloadFlag = false; _vm->_startup = 8; _function = FN_NONE; + bool fadeIn = true; while (!_vm->shouldQuit()) { _vm->_images.clear(); - if (_vm->_startup != -1 && --_vm->_startup == 0) { + if (_vm->_startup == -1 && !fadeIn) { _vm->_events->showCursor(); _vm->_screen->fadeIn(); + fadeIn = true; } // Poll for events diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp index b46f31f65a..98e188c0ca 100644 --- a/engines/access/screen.cpp +++ b/engines/access/screen.cpp @@ -89,8 +89,10 @@ void Screen::setPanel(int num) { } void Screen::updateScreen() { - if (_vm->_startup > 0) + if (_vm->_startup >= 0) { + --_vm->_startup; return; + } // Merge the dirty rects mergeDirtyRects(); -- cgit v1.2.3 From 5ad7c53c76c1ac97ae5a434d3f7e04a3e1a625ff Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 12 Dec 2015 20:59:17 -0500 Subject: ACCESS: Fix cursor after selecting inventory item to offer NPC --- engines/access/scripts.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines') diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 25b8c97be5..bb2875013b 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -536,6 +536,7 @@ void Scripts::cmdDispInv_v1() { void Scripts::cmdDispInv_v2() { _vm->_inventory->newDisplayInv(); + _vm->_events->forceSetCursor(CURSOR_ARROW); } void Scripts::cmdSetAbout() { -- cgit v1.2.3 From f9085aca0699d2b70e5310efe0e94ef9b0a41c87 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Sun, 13 Dec 2015 19:19:40 +0100 Subject: SCI: detection for Castle of Dr. Brain PC-9801 JP also known as Dr. Brain Puzzle no Shiro --- engines/sci/detection_tables.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engines') diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 4482375d19..f6283bf77b 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -172,6 +172,16 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::ES_ESP, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // Castle of Dr. Brain aka Dr. Brain Puzzle no Shiro - Japanese PC-98 Floppy (from m_kiewitz) + // includes both Japanese and English text + // Executable scanning reports "x.yyy.zzz", VERSION file reports "1.000" + {"castlebrain", "", { + {"resource.map", 0, "ff9674d5d0215a7ebae25ee38d5a72af", 2631}, + {"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 548272}, + {"resource.001", 0, "7c3e82c390e934de9b7afcab6de9cec4", 1117317}, + AD_LISTEND}, + Common::JA_JPN, Common::kPlatformPC98, ADGF_ADDENGLISH, GUIO5(GUIO_NOSPEECH, GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + #ifdef ENABLE_SCI32 // Inside the Chest / Behind the Developer's Shield // SCI interpreter version 2.000.000 -- cgit v1.2.3 From 1161e3e89d9c1d5aa72b184594d25411bc5ed472 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Sun, 13 Dec 2015 22:56:42 +0100 Subject: SCI: add difference for SCI1 PC-98 word-wrapping fixes small issue in Castle of Dr. Brain PC-98 Japanese room 120, when looking at the table Also added a few comments to Japanese word wrapping code --- engines/sci/graphics/text16.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index f463dff4b1..6ef616d3cb 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -144,12 +144,16 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1 } // Has actually punctuation and characters in it, that may not be the first in a line +// Table from Quest for Glory 1 PC-98 static const uint16 text16_shiftJIS_punctuation[] = { 0x9F82, 0xA182, 0xA382, 0xA582, 0xA782, 0xC182, 0xE182, 0xE382, 0xE582, 0xEC82, 0x4083, 0x4283, 0x4483, 0x4683, 0x4883, 0x6283, 0x8383, 0x8583, 0x8783, 0x8E83, 0x9583, 0x9683, 0x5B81, 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0 }; +// Police Quest 2 (SCI0) only checked for: 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881 +// Castle of Dr. Brain/King's Quest 5/Space Quest 4 (SCI1) only checked for: 0x4181, 0x4281, 0x7681, 0x7881 + // return max # of chars to fit maxwidth with full words, does not include // breaking space // Also adjusts text pointer to the new position for the caller @@ -201,9 +205,10 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId } // it's meant to pass through here case 0xA: - case 0x9781: // this one is used by SQ4/japanese as line break as well + case 0x9781: // this one is used by SQ4/japanese as line break as well (was added for SCI1/PC98) curCharCount++; textPtr++; if (curChar > 0xFF) { + // skip another byte in case char is double-byte (PC-98) curCharCount++; textPtr++; } // and it's also meant to pass through here @@ -261,6 +266,7 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId // But it also checked, if the current character is not inside a punctuation table and it even // went backwards in case it found multiple ones inside that table. + // Note: PQ2 PC-98 only went back 1 character and not multiple ones uint nonBreakingPos = 0; while (1) { @@ -285,6 +291,14 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId error("Non double byte while seeking back"); curChar |= (*(const byte *)(textPtr + 1)) << 8; } + + if (curChar == 0x4081) { + // Skip over alphabetic double-byte space + // This was introduced for SCI1 + // Happens in Castle of Dr. Brain PC-98 in room 120, when looking inside the mirror + // (game mentions Mixed Up Fairy Tales and uses English letters for that) + textPtr += 2; + } } // We split the word in that case -- cgit v1.2.3 From 431d33b119301b8dc2fc71fa42b9c53a04c32d1b Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Mon, 14 Dec 2015 00:20:56 +0100 Subject: SCI: use diff. PC98 word wrap tables for SCI0/01/1 also added even more comments about details of word wrapping SCI0 (PQ2) and SCI1 (Brain/KQ5/SQ4) got their own table now --- engines/sci/graphics/text16.cpp | 42 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp index 6ef616d3cb..89c9be59f0 100644 --- a/engines/sci/graphics/text16.cpp +++ b/engines/sci/graphics/text16.cpp @@ -144,8 +144,14 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1 } // Has actually punctuation and characters in it, that may not be the first in a line -// Table from Quest for Glory 1 PC-98 +// SCI1 didn't check for exclamation nor question marks, us checking for those too shouldn't be bad static const uint16 text16_shiftJIS_punctuation[] = { + 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0 +}; + +// Table from Quest for Glory 1 PC-98 (SCI01) +// has pronunciation and small combining form characters on top (details right after this table) +static const uint16 text16_shiftJIS_punctuation_SCI01[] = { 0x9F82, 0xA182, 0xA382, 0xA582, 0xA782, 0xC182, 0xE182, 0xE382, 0xE582, 0xEC82, 0x4083, 0x4283, 0x4483, 0x4683, 0x4883, 0x6283, 0x8383, 0x8583, 0x8783, 0x8E83, 0x9583, 0x9683, 0x5B81, 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881, 0 @@ -154,6 +160,25 @@ static const uint16 text16_shiftJIS_punctuation[] = { // Police Quest 2 (SCI0) only checked for: 0x4181, 0x4281, 0x7681, 0x7881, 0x4981, 0x4881 // Castle of Dr. Brain/King's Quest 5/Space Quest 4 (SCI1) only checked for: 0x4181, 0x4281, 0x7681, 0x7881 +// SCI0/SCI01/SCI1: +// 0x4181 -> comma, 0x4281 -> period / full stop +// 0x7681 -> ending quotation mark, 0x7881 -> secondary quotation mark + +// SCI0/SCI01: +// 0x4981 -> exclamation mark, 0x4881 -> question mark + +// SCI01 (Quest for Glory only): +// 0x9F82, 0xA182, 0xA382, 0xA582, 0xA782 -> specifies vowel part of prev. hiragana char or pronunciation/extension of vowel +// 0xC182 -> pronunciation +// 0xE182, 0xE382, 0xE582, 0xEC82 -> small combining form of hiragana +// 0x4083, 0x4283, 0x4483, 0x4683, 0x4883 -> small combining form of katagana +// 0x6283 -> glottal stop / sokuon +// 0x8383, 0x8583 0x8783, 0x8E83 -> small combining form of katagana +// 0x9583 -> combining form +// 0x9683 -> abbreviation for the kanji (ka), the counter for months, places or provisions +// 0x5b81 -> low line / underscore (full width) + + // return max # of chars to fit maxwidth with full words, does not include // breaking space // Also adjusts text pointer to the new position for the caller @@ -269,15 +294,24 @@ int16 GfxText16::GetLongest(const char *&textPtr, int16 maxWidth, GuiResourceId // Note: PQ2 PC-98 only went back 1 character and not multiple ones uint nonBreakingPos = 0; + const uint16 *punctuationTable; + + if (getSciVersion() != SCI_VERSION_01) { + punctuationTable = text16_shiftJIS_punctuation; + } else { + // Quest for Glory 1 PC-98 only + punctuationTable = text16_shiftJIS_punctuation_SCI01; + } + while (1) { // Look up if character shouldn't be the first on a new line nonBreakingPos = 0; - while (text16_shiftJIS_punctuation[nonBreakingPos]) { - if (text16_shiftJIS_punctuation[nonBreakingPos] == curChar) + while (punctuationTable[nonBreakingPos]) { + if (punctuationTable[nonBreakingPos] == curChar) break; nonBreakingPos++; } - if (!text16_shiftJIS_punctuation[nonBreakingPos]) { + if (!punctuationTable[nonBreakingPos]) { // character is fine break; } -- cgit v1.2.3 From 74321fcd22e6bb6598abfefc9a52de87a422ee7a Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 03:50:45 +0100 Subject: SWORD25: Let ImgLoader write into Graphics::Surface. --- engines/sword25/gfx/image/imgloader.cpp | 29 +++++++++++++---------------- engines/sword25/gfx/image/imgloader.h | 19 ++++++++----------- engines/sword25/gfx/image/renderedimage.cpp | 13 ++----------- engines/sword25/gfx/image/swimage.cpp | 19 ++++++------------- engines/sword25/gfx/image/swimage.h | 9 +++------ 5 files changed, 32 insertions(+), 57 deletions(-) (limited to 'engines') diff --git a/engines/sword25/gfx/image/imgloader.cpp b/engines/sword25/gfx/image/imgloader.cpp index f299cee9d1..6ec0e7c542 100644 --- a/engines/sword25/gfx/image/imgloader.cpp +++ b/engines/sword25/gfx/image/imgloader.cpp @@ -33,11 +33,13 @@ #include "sword25/gfx/image/image.h" #include "sword25/gfx/image/imgloader.h" #include "graphics/pixelformat.h" +#include "graphics/surface.h" #include "image/png.h" namespace Sword25 { -bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&uncompressedDataPtr, int &width, int &height, int &pitch) { +bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, Graphics::Surface *dest) { + assert(dest); Common::MemoryReadStream *fileStr = new Common::MemoryReadStream(fileDataPtr, fileSize, DisposeAfterUse::NO); ::Image::PNGDecoder png; @@ -47,12 +49,9 @@ bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&un const Graphics::Surface *sourceSurface = png.getSurface(); Graphics::Surface *pngSurface = sourceSurface->convertTo(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0), png.getPalette()); - width = pngSurface->w; - height = pngSurface->h; - uncompressedDataPtr = new byte[pngSurface->pitch * pngSurface->h]; - memcpy(uncompressedDataPtr, (byte *)pngSurface->getPixels(), pngSurface->pitch * pngSurface->h); - pngSurface->free(); + dest->copyFrom(*pngSurface); + pngSurface->free(); delete pngSurface; delete fileStr; @@ -60,24 +59,22 @@ bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&un return true; } -bool ImgLoader::decodeThumbnailImage(const byte *pFileData, uint fileSize, byte *&pUncompressedData, int &width, int &height, int &pitch) { +bool ImgLoader::decodeThumbnailImage(const byte *pFileData, uint fileSize, Graphics::Surface *dest) { + assert(dest); const byte *src = pFileData + 4; // skip header - width = READ_LE_UINT16(src); src += 2; - height = READ_LE_UINT16(src); src += 2; + uint width = READ_LE_UINT16(src); src += 2; + uint height = READ_LE_UINT16(src); src += 2; src++; // version, ignored for now - pitch = width * 4; - uint32 totalSize = pitch * height; - pUncompressedData = new byte[totalSize]; - uint32 *dst = (uint32 *)pUncompressedData; // treat as uint32, for pixelformat output - const Graphics::PixelFormat format = Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0); + dest->create(width, height, Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); + uint32 *dst = (uint32 *)dest->getBasePtr(0, 0); // treat as uint32, for pixelformat output byte r, g, b; - for (uint32 i = 0; i < totalSize / 4; i++) { + for (uint32 i = 0; i < width * height; i++) { r = *src++; g = *src++; b = *src++; - *dst++ = format.RGBToColor(r, g, b); + *dst++ = dest->format.RGBToColor(r, g, b); } return true; diff --git a/engines/sword25/gfx/image/imgloader.h b/engines/sword25/gfx/image/imgloader.h index b932cdc903..d9cf3f4d6d 100644 --- a/engines/sword25/gfx/image/imgloader.h +++ b/engines/sword25/gfx/image/imgloader.h @@ -35,6 +35,10 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/graphicengine.h" +namespace Graphics { +struct Surface; +} // End of namespace Graphics + namespace Sword25 { /** @@ -52,25 +56,18 @@ public: * Decode an image. * @param[in] fileDatePtr pointer to the image data * @param[in] fileSize size of the image data in bytes - * @param[out] pUncompressedData if successful, this is set to a pointer containing the decoded image data - * @param[out] width if successful, this is set to the width of the image - * @param[out] height if successful, this is set to the height of the image - * @param[out] pitch if successful, this is set to the number of bytes per scanline in the image + * @param[out] dest if successful, surface will contain the image + * data (storage is allocated via create). * @return false in case of an error * - * @remark The size of the output data equals pitch * height. * @remark This function does not free the image buffer passed to it, * it is the callers responsibility to do so. */ static bool decodePNGImage(const byte *pFileData, uint fileSize, - byte *&pUncompressedData, - int &width, int &height, - int &pitch); + Graphics::Surface *dest); static bool decodeThumbnailImage(const byte *pFileData, uint fileSize, - byte *&pUncompressedData, - int &width, int &height, - int &pitch); + Graphics::Surface *dest); }; } // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp index 8c6369a790..0225787fde 100644 --- a/engines/sword25/gfx/image/renderedimage.cpp +++ b/engines/sword25/gfx/image/renderedimage.cpp @@ -126,19 +126,10 @@ RenderedImage::RenderedImage(const Common::String &filename, bool &result) : } // Uncompress the image - int pitch; - byte *dst; - int w, h; if (isPNG) - result = ImgLoader::decodePNGImage(pFileData, fileSize, dst, w, h, pitch); + result = ImgLoader::decodePNGImage(pFileData, fileSize, &_surface); else - result = ImgLoader::decodeThumbnailImage(pFileData, fileSize, dst, w, h, pitch); - - _surface.w = w; - _surface.h = h; - _surface.pitch = w * 4; - _surface.setPixels(dst); - _surface.format = Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0); + result = ImgLoader::decodeThumbnailImage(pFileData, fileSize, &_surface); if (!result) { error("Could not decode image."); diff --git a/engines/sword25/gfx/image/swimage.cpp b/engines/sword25/gfx/image/swimage.cpp index 776f8ce8d3..7a3c95b5f9 100644 --- a/engines/sword25/gfx/image/swimage.cpp +++ b/engines/sword25/gfx/image/swimage.cpp @@ -35,10 +35,7 @@ namespace Sword25 { -SWImage::SWImage(const Common::String &filename, bool &result) : - _imageDataPtr(0), - _width(0), - _height(0) { +SWImage::SWImage(const Common::String &filename, bool &result) : _image() { result = false; PackageManager *pPackage = Kernel::getInstance()->getPackage(); @@ -54,9 +51,7 @@ SWImage::SWImage(const Common::String &filename, bool &result) : } // Uncompress the image - int pitch; - byte *pUncompressedData; - if (!ImgLoader::decodePNGImage(pFileData, fileSize, pUncompressedData, _width, _height, pitch)) { + if (!ImgLoader::decodePNGImage(pFileData, fileSize, &_image)) { error("Could not decode image."); return; } @@ -64,14 +59,12 @@ SWImage::SWImage(const Common::String &filename, bool &result) : // Cleanup FileData delete[] pFileData; - _imageDataPtr = (uint *)pUncompressedData; - result = true; return; } SWImage::~SWImage() { - delete[] _imageDataPtr; + _image.free(); } @@ -96,10 +89,10 @@ bool SWImage::setContent(const byte *pixeldata, uint size, uint offset, uint str } uint SWImage::getPixel(int x, int y) { - assert(x >= 0 && x < _width); - assert(y >= 0 && y < _height); + assert(x >= 0 && x < _image.w); + assert(y >= 0 && y < _image.h); - return _imageDataPtr[_width * y + x]; + return *((const uint32 *)_image.getBasePtr(0, 0)); } } // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/swimage.h b/engines/sword25/gfx/image/swimage.h index 60978eb6cc..97c6395278 100644 --- a/engines/sword25/gfx/image/swimage.h +++ b/engines/sword25/gfx/image/swimage.h @@ -45,10 +45,10 @@ public: virtual ~SWImage(); virtual int getWidth() const { - return _width; + return _image.w; } virtual int getHeight() const { - return _height; + return _image.h; } virtual GraphicEngine::COLOR_FORMATS getColorFormat() const { return GraphicEngine::CF_ARGB32; @@ -86,10 +86,7 @@ public: return false; } private: - uint *_imageDataPtr; - - int _width; - int _height; + Graphics::Surface _image; }; } // End of namespace Sword25 -- cgit v1.2.3 From 184ae49302792a924856ae051f1a96078f0723a1 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 04:24:32 +0100 Subject: SWORD25: Plug memory leak in RenderedImage. --- engines/sword25/gfx/image/renderedimage.cpp | 3 +++ engines/sword25/gfx/image/renderedimage.h | 3 +++ 2 files changed, 6 insertions(+) (limited to 'engines') diff --git a/engines/sword25/gfx/image/renderedimage.cpp b/engines/sword25/gfx/image/renderedimage.cpp index 0225787fde..8d90d1fa8b 100644 --- a/engines/sword25/gfx/image/renderedimage.cpp +++ b/engines/sword25/gfx/image/renderedimage.cpp @@ -178,6 +178,9 @@ RenderedImage::RenderedImage() : _isTransparent(true) { // ----------------------------------------------------------------------------- RenderedImage::~RenderedImage() { + if (_doCleanup) { + _surface.free(); + } } // ----------------------------------------------------------------------------- diff --git a/engines/sword25/gfx/image/renderedimage.h b/engines/sword25/gfx/image/renderedimage.h index 5b65a27355..e4d573f369 100644 --- a/engines/sword25/gfx/image/renderedimage.h +++ b/engines/sword25/gfx/image/renderedimage.h @@ -44,6 +44,9 @@ namespace Sword25 { class RenderedImage : public Image { +private: + RenderedImage(const RenderedImage &) : _doCleanup(false) {} + RenderedImage &operator=(const RenderedImage &) { return *this; } public: RenderedImage(const Common::String &filename, bool &result); -- cgit v1.2.3 From cb8e611e3373d8a87c931855916cf079eaad55dc Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 04:35:50 +0100 Subject: SWORD25: Fix uninitialized variable usage. When using the constructor of Panel which directly calls unpersist _color was uninitialized. However, unpersit uses setColor which assumes _color is initialized properly. Caused valgrind warnings when loading. --- engines/sword25/gfx/panel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sword25/gfx/panel.cpp b/engines/sword25/gfx/panel.cpp index 9699db7f6a..2b71854060 100644 --- a/engines/sword25/gfx/panel.cpp +++ b/engines/sword25/gfx/panel.cpp @@ -62,7 +62,7 @@ Panel::Panel(RenderObjectPtr parentPtr, int width, int height, uin } Panel::Panel(InputPersistenceBlock &reader, RenderObjectPtr parentPtr, uint handle) : - RenderObject(parentPtr, RenderObject::TYPE_PANEL, handle) { + RenderObject(parentPtr, RenderObject::TYPE_PANEL, handle), _color(0) { _initSuccess = unpersist(reader); } -- cgit v1.2.3 From 40421f1854a157703c3c8faddc1b622c39ecce4c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 04:49:36 +0100 Subject: SWORD25: Cleanup. --- engines/sword25/gfx/image/vectorimage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp index 756d063d43..a678fdccad 100644 --- a/engines/sword25/gfx/image/vectorimage.cpp +++ b/engines/sword25/gfx/image/vectorimage.cpp @@ -311,8 +311,7 @@ VectorImage::~VectorImage() { if (_elements[j].getPathInfo(i).getVec()) free(_elements[j].getPathInfo(i).getVec()); - if (_pixelData) - free(_pixelData); + free(_pixelData); } -- cgit v1.2.3 From 6dabb5c414de8931c989a8fe5b0ac3eef3b67ac0 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 05:14:48 +0100 Subject: SWORD25: Call requested pixel format by its correct name. --- engines/sword25/sword25.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index 76142c2534..5223481d50 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -95,7 +95,7 @@ Common::Error Sword25Engine::run() { } Common::Error Sword25Engine::appStart() { - // Initialize the graphics mode to ARGB8888 + // Initialize the graphics mode to RGBA8888 Graphics::PixelFormat format = Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0); initGraphics(800, 600, true, &format); if (format != g_system->getScreenFormat()) -- cgit v1.2.3 From 35244a8643b53fdf753b4650c5cd0f1ad3829b9b Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 14 Dec 2015 05:23:16 +0100 Subject: SWORD25: Make #include follow our conventions. --- engines/sword25/gfx/image/vectorimagerenderer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engines') diff --git a/engines/sword25/gfx/image/vectorimagerenderer.cpp b/engines/sword25/gfx/image/vectorimagerenderer.cpp index c69cb497c1..be734c7b98 100644 --- a/engines/sword25/gfx/image/vectorimagerenderer.cpp +++ b/engines/sword25/gfx/image/vectorimagerenderer.cpp @@ -38,8 +38,7 @@ * */ -#include "art.h" - +#include "sword25/gfx/image/art.h" #include "sword25/gfx/image/vectorimage.h" #include "graphics/colormasks.h" -- cgit v1.2.3 From 8dd9d44b1ff4bd531f7668973206be2fb372fdde Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Mon, 14 Dec 2015 20:23:57 +0100 Subject: MOHAWK: Fix loading the Myst cabin gauge movie --- engines/mohawk/myst_stacks/myst.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines') diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 98f0aa5349..9ad1635757 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -3683,16 +3683,16 @@ void Myst::boilerFireUpdate(bool init) { void Myst::boilerGaugeInit() { if (_vm->getCurCard() == 4098) { _cabinGaugeMovie = _vm->_video->playMovie(_vm->wrapMovieFilename("cabingau", kMystStack)); - if (!_cabinFireMovie) + if (!_cabinGaugeMovie) error("Failed to open cabingau movie"); - _cabinFireMovie->moveTo(243, 96); + _cabinGaugeMovie->moveTo(243, 96); } else { _cabinGaugeMovie = _vm->_video->playMovie(_vm->wrapMovieFilename("cabcgfar", kMystStack)); - if (!_cabinFireMovie) + if (!_cabinGaugeMovie) error("Failed to open cabcgfar movie"); - _cabinFireMovie->moveTo(254, 136); + _cabinGaugeMovie->moveTo(254, 136); } Audio::Timestamp frame; -- cgit v1.2.3 From d80c39bb29638bed4bff6453502878eaa5afbbf9 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 15 Dec 2015 03:19:25 +0200 Subject: NEVERHOOD: Update resource patches for the DR version - fixes bug #6913 Some of the resource patches needed to be modified to work with the latest changes to the DCL decoder --- engines/neverhood/resourceman.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'engines') diff --git a/engines/neverhood/resourceman.cpp b/engines/neverhood/resourceman.cpp index 2065a13347..81a9d8a907 100644 --- a/engines/neverhood/resourceman.cpp +++ b/engines/neverhood/resourceman.cpp @@ -96,24 +96,26 @@ struct EntrySizeFix { static const EntrySizeFix entrySizeFixes[] = { // fileHash offset diskSize size fixedSize // Fixes for the Russian "Dyadyushka Risech" version - { 0x041137051, 667019, 23391, 41398, 41401 }, // "Options" menu header text + { 0x041137051, 667019, 23391, 41398, 29191 }, // "Options" menu header text { 0x00f960021, 402268, 1704, 4378, 1870 }, // "Save" menu { 0x01301a7ea, 1220008, 2373, 4146, 2877 }, // "Load" menu { 0x084181e81, 201409, 1622, 5058, 1833 }, // "Delete" menu + { 0x0C10B2015, 690410, 5850, 11162, 7870 }, // Menu text { 0x008C0AC24, 1031009, 3030, 6498, 3646 }, // Overwrite dialog - { 0x0c6604282, 12813649, 19623, 35894, 35895 }, // One of the fonts when reading Willie's notes + { 0x0c6604282, 12813649, 19623, 35894, 30370 }, // One of the fonts when reading Willie's notes { 0x080283101, 13104841, 1961, 3712, 3511 }, // First message from Willie + { 0x058208810, 46010519, 24852, 131874, 131776 }, // Entry to hut with musical lock (untested) { 0x000918480, 17676417, 581, 916, 706 }, // First wall in the museum - { 0x00800090C, 16064875, 19555, 38518, 38526 }, // First wall in the museum - { 0x058208810, 46010519, 24852, 131874, 131776 }, // Entry to hut with musical lock + { 0x00800090C, 16064875, 19555, 38518, 30263 }, // First wall in the museum { 0x00008E486, 39600019, 240, 454, 271 }, // Second wall in the museum { 0x003086004, 39621755, 482, 614, 600 }, // Second wall in the museum - { 0x02008048E, 39611075, 3798, 21089, 21087 }, // Next couple of walls in the museum - { 0x008586283, 39587864, 12155, 29731, 29730 }, // Next couple of walls in the museum - { 0x030A84C80, 39606142, 4933, 16305, 16275 }, // Next couple of walls in the museum - { 0x000C9A480, 39614873, 6882, 23915, 23913 }, // Next couple of walls in the museum - { 0x000098880, 39603114, 3028, 10860, 10859 }, // Next couple of walls in the museum - { 0x040080183, 39600259, 2855, 13400, 13395 }, // Last buggy wall in the museum + { 0x02008048E, 39611075, 3798, 21089, 6374 }, // Next walls in the museum + { 0x008586283, 39587864, 12155, 29731, 20582 }, // Next walls in the museum + { 0x030A84C80, 39606142, 4933, 16305, 8770 }, // Next walls in the museum + { 0x000C9A480, 39614873, 6882, 23915, 11571 }, // Next walls in the museum + { 0x000098880, 39603114, 3028, 10860, 4762 }, // Next walls in the museum + { 0x040080183, 39600259, 2855, 13400, 4305 }, // Next walls in the museum + { 0x004290188, 39580567, 7297, 27131, 12322 }, // Next walls in the museum // Fixes for the Russian "Fargus" version { 0x041137051, 758264, 29037, 49590, 49591 }, // "Options" menu header text -- cgit v1.2.3