diff options
| author | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
| commit | 798ddfaab500bb212f620cf095328eee5eb140a4 (patch) | |
| tree | 55b5d0b90affd88063c04b7ff62fea1616b83e80 /engines/toltecs/resource.cpp | |
| parent | ef663f95a516d8fe47a245653d418c047361281a (diff) | |
| parent | fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff) | |
| download | scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2 scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip | |
Merge branch 'master' into hopkins
Diffstat (limited to 'engines/toltecs/resource.cpp')
| -rw-r--r-- | engines/toltecs/resource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toltecs/resource.cpp b/engines/toltecs/resource.cpp index b95e0444b1..0b9f7c8fcd 100644 --- a/engines/toltecs/resource.cpp +++ b/engines/toltecs/resource.cpp @@ -66,7 +66,7 @@ void ArchiveReader::dump(uint resIndex, const char *prefix) { byte *data = new byte[resourceSize]; Common::String fn; - + if (prefix) fn = Common::String::format("%s_%04X.0", prefix, resIndex); else @@ -117,11 +117,11 @@ Resource *ResourceCache::load(uint resIndex) { resItem->data = new byte[resItem->size]; _vm->_arc->read(resItem->data, resItem->size); _vm->_arc->closeResource(); - + _cache[resIndex] = resItem; - + return resItem; - + } } |