libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LASTEXPRESS: Migrate engine to Path

Browse Source
This commit is contained in:
Le Philousophe 2023-09-17 18:23:43 +02:00 committed by Eugene Sandulenko
parent 244ee1b79e
commit 1a31b42ca4
8 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/lastexpress/data/archive.cpp
View File

@ -32,17 +32,17 @@
namespace LastExpress {
HPFArchive::HPFArchive(const Common::String &path) {
HPFArchive::HPFArchive(const Common::Path &path) {
_filename = path;
// Open a stream to the archive
Common::SeekableReadStream *archive = SearchMan.createReadStreamForMember(_filename);
if (!archive) {
debugC(2, kLastExpressDebugResource, "Error opening file: %s", path.c_str());
debugC(2, kLastExpressDebugResource, "Error opening file: %s", path.toString(Common::Path::kNativeSeparator).c_str());
return;
}
debugC(2, kLastExpressDebugResource, "Opened archive: %s", path.c_str());
debugC(2, kLastExpressDebugResource, "Opened archive: %s", path.toString(Common::Path::kNativeSeparator).c_str());
// Read header to get the number of files
uint32 numFiles = archive->readUint32LE();
@ -90,11 +90,10 @@ int HPFArchive::listMembers(Common::ArchiveMemberList &list) const {
}
const Common::ArchiveMemberPtr HPFArchive::getMember(const Common::Path &path) const {
Common::String name = path.toString();
if (!hasFile(name))
if (!hasFile(path))
return Common::ArchiveMemberPtr();
return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, *this));
return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(path, *this));
}
Common::SeekableReadStream *HPFArchive::createReadStreamForMember(const Common::Path &path) const {

4
engines/lastexpress/data/archive.h
View File

@ -43,7 +43,7 @@ namespace LastExpress {
class HPFArchive : public Common::Archive {
public:
HPFArchive(const Common::String &path);
HPFArchive(const Common::Path &path);
bool hasFile(const Common::Path &path) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
@ -66,7 +66,7 @@ private:
typedef Common::HashMap<Common::String, HPFEntry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
FileMap _files; ///< List of files
Common::String _filename; ///< Filename of the archive
Common::Path _filename; ///< Filename of the archive
};
} // End of namespace LastExpress

14
engines/lastexpress/debug.cpp
View File

@ -239,7 +239,7 @@ bool Debugger::cmdHelp(int, const char **) {
*/
bool Debugger::cmdListFiles(int argc, const char **argv) {
if (argc == 2 || argc == 3) {
Common::String filter(const_cast<char *>(argv[1]));
Common::Path filter(const_cast<char *>(argv[1]));
// Load the proper archive
if (argc == 3) {
@ -333,7 +333,7 @@ bool Debugger::cmdShowFrame(int argc, const char **argv) {
return true;
}
if (!_engine->getResourceManager()->hasFile(filename)) {
if (!_engine->getResourceManager()->hasFile(Common::Path(filename))) {
debugPrintf("Cannot find file: %s\n", filename.c_str());
return true;
}
@ -395,7 +395,7 @@ bool Debugger::cmdShowBg(int argc, const char **argv) {
return true;
}
if (!_engine->getResourceManager()->hasFile(filename + ".BG")) {
if (!_engine->getResourceManager()->hasFile(Common::Path(filename + ".BG"))) {
debugPrintf("Cannot find file: %s\n", (filename + ".BG").c_str());
return true;
}
@ -450,7 +450,7 @@ bool Debugger::cmdPlaySeq(int argc, const char **argv) {
return true;
}
if (!_engine->getResourceManager()->hasFile(filename)) {
if (!_engine->getResourceManager()->hasFile(Common::Path(filename))) {
debugPrintf("Cannot find file: %s\n", filename.c_str());
return true;
}
@ -531,7 +531,7 @@ bool Debugger::cmdPlaySnd(int argc, const char **argv) {
if (!name.contains('.'))
name += ".SND";
if (!_engine->getResourceManager()->hasFile(name)) {
if (!_engine->getResourceManager()->hasFile(Common::Path(name))) {
debugPrintf("Cannot find file: %s\n", name.c_str());
return true;
}
@ -567,7 +567,7 @@ bool Debugger::cmdPlaySbe(int argc, const char **argv) {
filename += ".sbe";
if (!_engine->getResourceManager()->hasFile(filename)) {
if (!_engine->getResourceManager()->hasFile(Common::Path(filename))) {
debugPrintf("Cannot find file: %s\n", filename.c_str());
return true;
}
@ -633,7 +633,7 @@ bool Debugger::cmdPlayNis(int argc, const char **argv) {
}
// If we got a nis filename, check that the file exists
if (name.contains('.') && !_engine->getResourceManager()->hasFile(name)) {
if (name.contains('.') && !_engine->getResourceManager()->hasFile(Common::Path(name))) {
debugPrintf("Cannot find file: %s\n", name.c_str());
return true;
}

2
engines/lastexpress/lastexpress.cpp
View File

@ -65,7 +65,7 @@ LastExpressEngine::LastExpressEngine(OSystem *syst, const ADGameDescription *gd)
Engine::syncSoundSettings();
// Adding the default directories
const Common::FSNode gameDataDir(ConfMan.get("path"));
const Common::FSNode gameDataDir(ConfMan.getPath("path"));
SearchMan.addSubDirectoryMatching(gameDataDir, "data");
}

25
engines/lastexpress/resource.cpp
View File

@ -113,11 +113,11 @@ void ResourceManager::reset() {
_archives.clear();
}
bool ResourceManager::loadArchive(const Common::String &name) {
bool ResourceManager::loadArchive(const Common::Path &name) {
HPFArchive *archive = new HPFArchive(name);
if (archive->count() == 0) {
debugC(2, kLastExpressDebugResource, "Error opening archive: %s", name.c_str());
debugC(2, kLastExpressDebugResource, "Error opening archive: %s", name.toString(Common::Path::kNativeSeparator).c_str());
delete archive;
@ -132,25 +132,25 @@ bool ResourceManager::loadArchive(const Common::String &name) {
// Get a stream to file in the archive
// - same as createReadStreamForMember except it checks if the file exists and will assert / output a debug message if not
Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String &name) const {
Common::Path path(name);
// Check if the file exits in the archive
if (!hasFile(name)) {
if (!hasFile(path)) {
debugC(2, kLastExpressDebugResource, "Error opening file: %s", name.c_str());
return nullptr;
}
debugC(2, kLastExpressDebugResource, "Opening file: %s", name.c_str());
return createReadStreamForMember(name);
return createReadStreamForMember(path);
}
//////////////////////////////////////////////////////////////////////////
// Archive functions
//////////////////////////////////////////////////////////////////////////
bool ResourceManager::hasFile(const Common::Path &path) const {
Common::String name = path.toString();
for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) {
if ((*it)->hasFile(name))
if ((*it)->hasFile(path))
return true;
}
@ -172,18 +172,15 @@ int ResourceManager::listMembers(Common::ArchiveMemberList &list) const {
}
const Common::ArchiveMemberPtr ResourceManager::getMember(const Common::Path &path) const {
Common::String name = path.toString();
if (!hasFile(name))
if (!hasFile(path))
return Common::ArchiveMemberPtr();
return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, *this));
return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(path, *this));
}
Common::SeekableReadStream *ResourceManager::createReadStreamForMember(const Common::Path &path) const {
Common::String name = path.toString();
for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) {
Common::SeekableReadStream *stream = (*it)->createReadStreamForMember(name);
Common::SeekableReadStream *stream = (*it)->createReadStreamForMember(path);
if (stream)
return stream;
@ -196,8 +193,10 @@ Common::SeekableReadStream *ResourceManager::createReadStreamForMember(const Com
// Resource loading
Background *ResourceManager::loadBackground(const Common::String &name) const {
Common::Path path(name);
path.appendInPlace(".bg");
// Open the resource
Common::SeekableReadStream *stream = createReadStreamForMember(name + ".bg");
Common::SeekableReadStream *stream = createReadStreamForMember(path);
if (!stream)
return nullptr;

2
engines/lastexpress/resource.h
View File

@ -57,7 +57,7 @@ public:
private:
bool _isDemo;
bool loadArchive(const Common::String &name);
bool loadArchive(const Common::Path &name);
void reset();
Common::Array<HPFArchive *> _archives;

6
engines/lastexpress/sound/entry.cpp
View File

@ -331,7 +331,7 @@ void SoundEntry::initDelayedActivate(unsigned activateDelay) {
_status |= kSoundFlagDelayedActivate;
}
void SoundEntry::setSubtitles(Common::String filename) {
void SoundEntry::setSubtitles(const Common::String &filename) {
_subtitle = new SubtitleEntry(_engine);
_subtitle->load(filename, this);
@ -444,7 +444,7 @@ SubtitleEntry::~SubtitleEntry() {
_engine = nullptr;
}
void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) {
void SubtitleEntry::load(const Common::String &filename, SoundEntry *soundEntry) {
// Add ourselves to the list of active subtitles
getSoundQueue()->addSubtitle(this);
@ -453,7 +453,7 @@ void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) {
_sound = soundEntry;
// Load subtitle data
if (_engine->getResourceManager()->hasFile(_filename)) {
if (_engine->getResourceManager()->hasFile(Common::Path(_filename))) {
if (getSoundQueue()->getSubtitleFlag() & 2)
return;

4
engines/lastexpress/sound/entry.h
View File

@ -113,7 +113,7 @@ public:
void initDelayedActivate(unsigned activateDelay);
// Subtitles
void setSubtitles(Common::String filename);
void setSubtitles(const Common::String &filename);
// Serializable
void saveLoadWithSerializer(Common::Serializer &ser) override;
@ -183,7 +183,7 @@ public:
SubtitleEntry(LastExpressEngine *engine);
~SubtitleEntry();
void load(Common::String filename, SoundEntry *soundEntry);
void load(const Common::String &filename, SoundEntry *soundEntry);
void loadData();
void close();
void setupAndDraw();