libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 23:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HDB: Add the find functions to the file-manager

Browse Source
This commit is contained in:
Nipun Garg 2019-05-28 17:37:43 +05:30 committed by Eugene Sandulenko
parent 6a764f4252
commit 432ae5ad57
2 changed files with 71 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
engines/hdb/file-manager.cpp
View File

@ -27,15 +27,15 @@
namespace HDB {
bool FileMan::openMSD(const Common::String &filename) {
bool FileMan::openMPC(const Common::String &filename) {
uint32 offset;
if (!_msdFile->open(filename)) {
if (!_mpcFile->open(filename)) {
error("FileMan::openMSD(): Error reading the MSD file");
return false;
}
_msdFile->read(&dataHeader.id, 4);
_mpcFile->read(&dataHeader.id, 4);
if (dataHeader.id == MKTAG('M', 'P', 'C', 'C')) {
_compressed = true;
@ -45,25 +45,25 @@ bool FileMan::openMSD(const Common::String &filename) {
else if (dataHeader.id == MKTAG('M', 'P', 'C', 'U')) {
_compressed = false;
offset = _msdFile->readUint32LE();
_msdFile->seek((int32)offset, SEEK_SET);
offset = _mpcFile->readUint32LE();
_mpcFile->seek((int32)offset, SEEK_SET);
// Note: The MPC archive format assumes the offset to be uint32,
// but Common::File::seek() takes the offset as int32.
dataHeader.dirSize = _msdFile->readUint32LE();
dataHeader.dirSize = _mpcFile->readUint32LE();
for (uint32 fileIndex = 0; fileIndex < dataHeader.dirSize; fileIndex++) {
MSDEntry *dirEntry = new MSDEntry();
MPCEntry *dirEntry = new MPCEntry();
for (int fileNameIndex = 0; fileNameIndex < 64; fileNameIndex++) {
dirEntry->filename[fileNameIndex] = _msdFile->readByte();
dirEntry->filename[fileNameIndex] = _mpcFile->readByte();
}
dirEntry->offset = _msdFile->readUint32LE();
dirEntry->length = _msdFile->readUint32LE();
dirEntry->ulength = _msdFile->readUint32LE();
dirEntry->type = (DataType)_msdFile->readUint32LE();
dirEntry->offset = _mpcFile->readUint32LE();
dirEntry->length = _mpcFile->readUint32LE();
dirEntry->ulength = _mpcFile->readUint32LE();
dirEntry->type = (DataType)_mpcFile->readUint32LE();
_dir.push_back(dirEntry);
}
@ -77,9 +77,49 @@ bool FileMan::openMSD(const Common::String &filename) {
}
void FileMan::closeMSD() {
void FileMan::closeMPC() {
_dir.clear();
_msdFile->close();
_mpcFile->close();
}
MPCEntry **FileMan::findFirstData(char *string, DataType type) {
Common::String fileString;
for (MPCIterator it = _dir.begin(); it != _dir.end(); it++) {
fileString = (*it)->filename;
if (fileString.contains(string)) {
if ((*it)->type == type) {
return it;
}
}
}
return NULL;
}
MPCEntry **FileMan::findNextData(MPCIterator begin) {
Common::String fileString;
for (MPCIterator it = begin+1; it != _dir.end(); it++) {
fileString = (*it)->filename;
if (fileString.contains((*begin)->filename)) {
if ((*it)->type == (*begin)->type) {
return it;
}
}
}
return NULL;
}
int FileMan::findAmount(char *string, DataType type) {
int count = 0;
MPCIterator it = findFirstData(string, type);
while (it && (*it)->type == type) {
count++;
it = findNextData(it);
}
return count;
}
} // End of Namespace HDB

23
engines/hdb/file-manager.h
View File

@ -27,6 +27,8 @@
#include "common/file.h"
#include "common/error.h"
#define MPCIterator Common::Array<MPCEntry *>::iterator
namespace HDB {
// Each entry in a MSD file is of the following types
@ -42,7 +44,7 @@ enum DataType {
ENDOFTYPES
};
struct MSDEntry {
struct MPCEntry {
char filename[64]; // filename
int32 offset; // offset in MSD file of data
int32 length; // compressed length of data
@ -88,8 +90,8 @@ struct CharInfo {
class FileMan {
private:
Common::File *_msdFile;
Common::Array<MSDEntry *> _dir;
Common::File *_mpcFile;
Common::Array<MPCEntry *> _dir;
int _numEntries;
bool _compressed;
@ -100,10 +102,19 @@ public:
uint32 dirSize;
} dataHeader;
long readOffset;
uint32 readOffset;
bool openMSD(const Common::String &filename);
void closeMSD();
bool openMPC(const Common::String &filename);
void closeMPC();
/*
TODO: Implement the loadData functions for the various
DataTypes as they are encountered.
void loadData(char *string, uint32 *length);
*/
MPCEntry **findFirstData(char *string, DataType type);
MPCEntry **findNextData(MPCIterator it);
int findAmount(char *string, DataType type);
};