diff options
author | Martin Kiewitz | 2015-06-14 19:35:09 +0200 |
---|---|---|
committer | Martin Kiewitz | 2015-06-14 19:35:09 +0200 |
commit | 56a0ba8b207e476ac238a941128b69beb9f3e70c (patch) | |
tree | 1b787c525dbd7785a9e8b19b61f284699fe57b81 | |
parent | 2d70a7af6ddbec99c87ed3885596b4b964cc58b1 (diff) | |
download | scummvm-rg350-56a0ba8b207e476ac238a941128b69beb9f3e70c.tar.gz scummvm-rg350-56a0ba8b207e476ac238a941128b69beb9f3e70c.tar.bz2 scummvm-rg350-56a0ba8b207e476ac238a941128b69beb9f3e70c.zip |
SHERLOCK: 3DO: make inventory work somewhat
inventory images is in item.lib on 3DO
-rw-r--r-- | engines/sherlock/inventory.cpp | 9 | ||||
-rw-r--r-- | engines/sherlock/resources.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/sherlock/inventory.cpp b/engines/sherlock/inventory.cpp index 94e90b516a..7973579bfd 100644 --- a/engines/sherlock/inventory.cpp +++ b/engines/sherlock/inventory.cpp @@ -105,9 +105,14 @@ void Inventory::loadGraphics() { // Get the name of the item to be displayed, figure out its accompanying // .VGS file with its picture, and then load it int invNum = findInv((*this)[idx]._name); - Common::String fName = Common::String::format("item%02d.vgs", invNum + 1); + Common::String filename = Common::String::format("item%02d.vgs", invNum + 1); - _invShapes[idx - _invIndex] = new ImageFile(fName); + if (_vm->getPlatform() != Common::kPlatform3DO) { + // PC + _invShapes[idx - _invIndex] = new ImageFile(filename); + } else { + _invShapes[idx - _invIndex] = new ImageFile3DO(filename, kImageFile3DOType_RoomFormat); + } } _invGraphicsLoaded = true; diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp index 71037fe6ad..32b074365a 100644 --- a/engines/sherlock/resources.cpp +++ b/engines/sherlock/resources.cpp @@ -104,9 +104,7 @@ Resources::Resources(SherlockEngine *vm) : _vm(vm), _cache(vm) { // 3DO // ITEM data from VGS.LIB is in ITEM.LIB - // resources themselves start with width and height as UINT16BE - // but after that they are different. Don't seem to be raw data - //addToCache("item.lib"); + addToCache("item.lib"); // talk.lib - resources themselves seem to be the same, although a few texts were slightly changed addToCache("talk.lib"); |