SHERLOCK: 3DO: make inventory work somewhat

inventory images is in item.lib on 3DO
scummvm · Jun 14, 2015 · 56a0ba8 · 56a0ba8
1 parent 2d70a7a
commit 56a0ba8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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");