aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/neverhood.cpp
diff options
context:
space:
mode:
authorjohndoe1232012-10-14 09:37:44 +0000
committerWillem Jan Palenstijn2013-05-08 20:47:07 +0200
commitfa53c0cf8350a873a3278c5debaee1562f51e15b (patch)
tree157f51770e068a870d0d7623188851b096b85e6c /engines/neverhood/neverhood.cpp
parenta80ec8c89c4cb102a92cf5e0fa2b2871d763486a (diff)
downloadscummvm-rg350-fa53c0cf8350a873a3278c5debaee1562f51e15b.tar.gz
scummvm-rg350-fa53c0cf8350a873a3278c5debaee1562f51e15b.tar.bz2
scummvm-rg350-fa53c0cf8350a873a3278c5debaee1562f51e15b.zip
NEVERHOOD: Work on the resource system:
- Remove unused stuff - Shuffle some stuff around
Diffstat (limited to 'engines/neverhood/neverhood.cpp')
-rw-r--r--engines/neverhood/neverhood.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index cfeaf927d3..72fa3601ed 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -238,11 +238,11 @@ void NeverhoodEngine::dumpAllResources() {
for (uint i = 0; i < entriesCount; i++) {
const ResourceFileEntry &entry = _res->getEntry(i);
- int type = _res->getResourceTypeByHash(entry.fileHash);
- debug("hash: %08X; type: %d", entry.fileHash, type);
+ int type = _res->getResourceTypeByHash(entry.archiveEntry->fileHash);
+ debug("hash: %08X; type: %d", entry.archiveEntry->fileHash, type);
if (type == 4) {
AnimResource anim(this);
- anim.load(entry.fileHash);
+ anim.load(entry.archiveEntry->fileHash);
for (uint frameIndex = 0; frameIndex < anim.getFrameCount(); frameIndex++) {
const AnimFrameInfo &frameInfo = anim.getFrameInfo(frameIndex);
int16 width = (frameInfo.rect.width + 3) & 0xFFFC;
@@ -251,8 +251,8 @@ void NeverhoodEngine::dumpAllResources() {
anim.draw(frameIndex, pixels, width, false, false);
Common::String filename =
frameInfo.frameHash != 0
- ? Common::String::format("%08X_%03d_%08X.tga", entry.fileHash, frameIndex, frameInfo.frameHash)
- : Common::String::format("%08X_%03d.tga", entry.fileHash, frameIndex);
+ ? Common::String::format("%08X_%03d_%08X.tga", entry.archiveEntry->fileHash, frameIndex, frameInfo.frameHash)
+ : Common::String::format("%08X_%03d.tga", entry.archiveEntry->fileHash, frameIndex);
writeTga(filename.c_str(), pixels, vgaPalette, width, frameInfo.rect.height);
delete[] pixels;
}