diff options
-rw-r--r-- | engines/access/amazon/amazon_resources.cpp | 32 | ||||
-rw-r--r-- | engines/access/amazon/amazon_resources.h | 1 | ||||
-rw-r--r-- | engines/access/char.cpp | 9 |
3 files changed, 40 insertions, 2 deletions
diff --git a/engines/access/amazon/amazon_resources.cpp b/engines/access/amazon/amazon_resources.cpp index bd4e4f838d..509c8bcac4 100644 --- a/engines/access/amazon/amazon_resources.cpp +++ b/engines/access/amazon/amazon_resources.cpp @@ -1383,6 +1383,31 @@ const byte LETTER[] = { 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 *CHARTBL[] = { ELAINE, LIB, FLASHBACK, ALLENDIE, OVERBOARD, PILOT2, TIKAGENT, BARTENDER, PILOT1, COOK, BEXPLODE, THORNICK, MAYA, CAPTAIN, @@ -1392,6 +1417,13 @@ const byte *CHARTBL[] = { CRACK, LETTER }; +const byte *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", diff --git a/engines/access/amazon/amazon_resources.h b/engines/access/amazon/amazon_resources.h index 777c579073..6e35ca0361 100644 --- a/engines/access/amazon/amazon_resources.h +++ b/engines/access/amazon/amazon_resources.h @@ -64,6 +64,7 @@ extern const byte *ROOM_TABLE_DEMO[]; extern const int ROOM_NUMB; extern const byte *CHARTBL[]; +extern const byte *CHARTBL_DEMO[]; extern const char *const INVENTORY_NAMES[]; diff --git a/engines/access/char.cpp b/engines/access/char.cpp index 8ce43a5730..d5eec3eb7f 100644 --- a/engines/access/char.cpp +++ b/engines/access/char.cpp @@ -71,8 +71,13 @@ CharManager::CharManager(AccessEngine *vm) : Manager(vm) { switch (vm->getGameID()) { case GType_Amazon: // Setup character list - for (int i = 0; i < 37; ++i) - _charTable.push_back(CharEntry(Amazon::CHARTBL[i])); + if (_vm->isDemo()) { + for (int i = 0; i < 27; ++i) + _charTable.push_back(CharEntry(Amazon::CHARTBL_DEMO[i])); + } else { + for (int i = 0; i < 37; ++i) + _charTable.push_back(CharEntry(Amazon::CHARTBL[i])); + } break; default: error("Unknown game"); |