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

NANCY: Add support for Nancy 6 CifTree format

Browse source
This commit is contained in:
Walter van Niftrik 2012-10-09 00:46:41 +02:00 • committed by Eugene Sandulenko
parent debe67fa1e
commit 9720ba812a
2 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/nancy/detection.cpp
View file

@ -54,7 +54,7 @@ const char *const directoryGlobs[] = {
static const PlainGameDescriptor nancyGames[] = { static const PlainGameDescriptor nancyGames[] = {
// Games // Games
{"nancy1", "Nancy Drew 1: Secrets Can Kill"}, {"nancy1", "Nancy Drew 1: Secrets Can Kill"},
{"nancy2", "Nancy Drew 2: Stay Tuned For Danger"}, {"nancy2", "Nancy Drew 2: Stay Tuned for Danger"},
{"nancy5", "Nancy Drew 5: The Final Scene"}, {"nancy5", "Nancy Drew 5: The Final Scene"},
{"nancy6", "Nancy Drew 6: Secret of the Scarlet Hand"}, {"nancy6", "Nancy Drew 6: Secret of the Scarlet Hand"},
{0, 0} {0, 0}

46
engines/nancy/resource.cpp
View file

@ -45,12 +45,6 @@ static void readCifInfo20(Common::File &f, ResourceManager::CifInfo &info, bool
info.type = f.readByte(); info.type = f.readByte();
} }
static void readCifInfo21(Common::File &f, ResourceManager::CifInfo &info, bool hasOffset = false) {
f.skip(32); // TODO
readCifInfo20(f, info, hasOffset);
}
class CifTree { class CifTree {
public: public:
virtual ~CifTree() { }; virtual ~CifTree() { };
@ -161,15 +155,16 @@ void CifTree20::readCifInfo(Common::File &f, CifInfoChain &chain) {
class CifTree21 : public CifTree { class CifTree21 : public CifTree {
public: public:
CifTree21() : _hasLongNames(false) { }; CifTree21() : _hasLongNames(false), _hasOffsetFirst(false) { };
protected: protected:
virtual uint readHeader(Common::File &f); virtual uint readHeader(Common::File &f);
virtual void readCifInfo(Common::File &f, CifInfoChain &chain); virtual void readCifInfo(Common::File &f, CifInfoChain &chain);
private: private:
void testLongNames(Common::File &f); void determineSubtype(Common::File &f);
bool _hasLongNames; bool _hasLongNames;
bool _hasOffsetFirst;
}; };
uint CifTree21::readHeader(Common::File &f) { uint CifTree21::readHeader(Common::File &f) {
@ -181,7 +176,7 @@ uint CifTree21::readHeader(Common::File &f) {
f.readByte(); // Unknown f.readByte(); // Unknown
f.readByte(); // Unknown f.readByte(); // Unknown
testLongNames(f); determineSubtype(f);
return infoBlockCount; return infoBlockCount;
} }
@ -200,13 +195,22 @@ void CifTree21::readCifInfo(Common::File &f, CifInfoChain &chain) {
f.skip(2); // Index of this block f.skip(2); // Index of this block
readCifInfo21(f, info, true); if (_hasOffsetFirst) {
info.dataOffset = f.readUint32LE();
chain.next = f.readUint16LE(); chain.next = f.readUint16LE();
} }
void CifTree21::testLongNames(Common::File &f) { f.skip(32); // TODO
// This is a heuristic for the switch to long filenames during the 2.1 version
readCifInfo20(f, info, !_hasOffsetFirst);
if (!_hasOffsetFirst)
chain.next = f.readUint16LE();
}
void CifTree21::determineSubtype(Common::File &f) {
// Perform heuristic for long filenames
// Assume short file names and read indices 1 and 2
uint pos = f.pos(); uint pos = f.pos();
f.seek(2159); f.seek(2159);
@ -215,8 +219,22 @@ void CifTree21::testLongNames(Common::File &f) {
f.seek(68, SEEK_CUR); f.seek(68, SEEK_CUR);
uint16 index2 = f.readUint16LE(); uint16 index2 = f.readUint16LE();
// If they don't match, this file must have long filenames
if (index1 != 1 || index2 != 2)
_hasLongNames = true;
if (_hasLongNames) {
// Perform heuristic for offset at the beginning of the block
// Read offset and next of the first info block
// If either of these is zero, offset can't be first
f.seek(2115);
uint32 offset = f.readUint32LE();
uint16 next = f.readUint32LE();
if (offset && next)
_hasOffsetFirst = true;
}
f.seek(pos); f.seek(pos);
_hasLongNames = !(index1 == 1 && index2 == 2);
} }
const CifTree *CifTree::load(const Common::String filename) { const CifTree *CifTree::load(const Common::String filename) {