thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for showing the icon bar in SCI1.1 Mac.

Browse source 
svn-id: r49196
This commit is contained in:
Matthew Hoops 2010-05-24 17:21:11 +00:00
parent ad0eb0b06e
commit d49fb8f42d
12 changed files with 205 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/sci/resource.cpp
View file

@ -445,11 +445,10 @@ void ResourceManager::loadResource(Resource *res) {
return;
if (res->_source->source_type == kSourceMacResourceFork) {
//error("ResourceManager::loadResource(): TODO: Mac resource fork ;)");
Common::SeekableReadStream *stream = res->_source->macResMan.getResource(resTypeToMacTag(res->_id.type), res->_id.number);
if (!stream)
error("Could not get Mac resource fork resource");
error("Could not get Mac resource fork resource: %d %d", res->_id.type, res->_id.number);
int error = decompress(res, stream);
if (error) {
@ -1476,7 +1475,10 @@ struct {
{ MKID_BE('PAL '), kResourceTypePalette },
{ MKID_BE('snd '), kResourceTypeAudio },
{ MKID_BE('MSG '), kResourceTypeMessage },
{ MKID_BE('HEP '), kResourceTypeHeap }
{ MKID_BE('HEP '), kResourceTypeHeap },
{ MKID_BE('IBIN'), kResourceTypeMacIconBarPictN },
{ MKID_BE('IBIS'), kResourceTypeMacIconBarPictS },
{ MKID_BE('PICT'), kResourceTypeMacPict }
};
static uint32 resTypeToMacTag(ResourceType type) {
@ -1509,6 +1511,16 @@ int ResourceManager::readMacResourceFork(ResourceSource *source) {
Common::MacResIDArray idArray = source->macResMan.getResIDArray(tagArray[i]);
for (uint32 j = 0; j < idArray.size(); j++) {
// Get the size of the file
Common::SeekableReadStream *stream = source->macResMan.getResource(tagArray[i], idArray[j]);
// Some IBIS resources have a size of 0, so we skip them
if (!stream)
continue;
uint32 fileSize = stream->size();
delete stream;
ResourceId resId = ResourceId(type, idArray[j]);
Resource *newrsc = NULL;
@ -1520,11 +1532,6 @@ int ResourceManager::readMacResourceFork(ResourceSource *source) {
} else
newrsc = _resMap.getVal(resId);
// Get the size of the file
Common::SeekableReadStream *stream = source->macResMan.getResource(tagArray[i], idArray[j]);
uint32 fileSize = stream->size();
delete stream;
// Overwrite everything
newrsc->_id = resId;
newrsc->_status = kResStatusNoMalloc;