diff options
Diffstat (limited to 'engines/agi')
-rw-r--r-- | engines/agi/detection.cpp | 6 | ||||
-rw-r--r-- | engines/agi/loader_v3.cpp | 4 | ||||
-rw-r--r-- | engines/agi/sound.cpp | 14 | ||||
-rw-r--r-- | engines/agi/sound.h | 4 | ||||
-rw-r--r-- | engines/agi/wagparser.cpp | 2 | ||||
-rw-r--r-- | engines/agi/wagparser.h | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index f05621e875..94cc4caf85 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -2207,7 +2207,7 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL bool matchedUsingWag = false; int wagFileCount = 0; WagFileParser wagFileParser; - Common::FilesystemNode wagFileNode; + Common::FSNode wagFileNode; Common::String description; Common::FSList fslistCurrentDir; // Only used if fslist == NULL @@ -2222,8 +2222,8 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL if (path.empty()) path = "."; - Common::FilesystemNode fsCurrentDir(path); - fsCurrentDir.getChildren(fslistCurrentDir, Common::FilesystemNode::kListFilesOnly); + Common::FSNode fsCurrentDir(path); + fsCurrentDir.getChildren(fslistCurrentDir, Common::FSNode::kListFilesOnly); fslist = &fslistCurrentDir; } diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp index 656ae232ec..bea57069c0 100644 --- a/engines/agi/loader_v3.cpp +++ b/engines/agi/loader_v3.cpp @@ -48,9 +48,9 @@ int AgiLoader_v3::detectGame() { bool found = false; Common::FSList fslist; - Common::FilesystemNode dir(ConfMan.get("path")); + Common::FSNode dir(ConfMan.get("path")); - if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly)) { + if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) { warning("AgiEngine: invalid game path '%s'", dir.getPath().c_str()); return errInvalidAGIFile; } diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 37896dc241..7138a3adad 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -1007,7 +1007,7 @@ const IIgsExeInfo *SoundMgr::getIIgsExeInfo(enum AgiGameID gameid) const { return NULL; } -bool IIgsSoundMgr::loadInstrumentHeaders(const Common::FilesystemNode &exePath, const IIgsExeInfo &exeInfo) { +bool IIgsSoundMgr::loadInstrumentHeaders(const Common::FSNode &exePath, const IIgsExeInfo &exeInfo) { bool loadedOk = false; // Was loading successful? Common::File file; @@ -1078,7 +1078,7 @@ bool SoundMgr::convertWave(Common::SeekableReadStream &source, int8 *dest, uint return !source.ioFailed(); } -bool IIgsSoundMgr::loadWaveFile(const Common::FilesystemNode &wavePath, const IIgsExeInfo &exeInfo) { +bool IIgsSoundMgr::loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInfo &exeInfo) { Common::File file; // Open the wave file and read it into memory @@ -1107,14 +1107,14 @@ bool IIgsSoundMgr::loadWaveFile(const Common::FilesystemNode &wavePath, const II } /** - * A function object (i.e. a functor) for testing if a Common::FilesystemNode + * A function object (i.e. a functor) for testing if a Common::FSNode * object's name is equal (Ignoring case) to a string or to at least * one of the strings in a list of strings. Can be used e.g. with find_if(). */ -struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FilesystemNode&, bool> { +struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FSNode&, bool> { fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {} fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); } - bool operator()(const Common::FilesystemNode ¶m) const { + bool operator()(const Common::FSNode ¶m) const { for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); iter++) if (param.getName().equalsIgnoreCase(*iter)) return true; @@ -1140,8 +1140,8 @@ bool SoundMgr::loadInstruments() { // List files in the game path Common::FSList fslist; - Common::FilesystemNode dir(ConfMan.get("path")); - if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly)) { + Common::FSNode dir(ConfMan.get("path")); + if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) { warning("Invalid game path (\"%s\"), not loading Apple IIGS instruments", dir.getPath().c_str()); return false; } diff --git a/engines/agi/sound.h b/engines/agi/sound.h index c0448952c3..0a6f5e302d 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -402,8 +402,8 @@ public: // For initializing IIgsSoundMgr(); void setProgramChangeMapping(const MidiProgramChangeMapping *mapping); - bool loadInstrumentHeaders(const Common::FilesystemNode &exePath, const IIgsExeInfo &exeInfo); - bool loadWaveFile(const Common::FilesystemNode &wavePath, const IIgsExeInfo &exeInfo); + bool loadInstrumentHeaders(const Common::FSNode &exePath, const IIgsExeInfo &exeInfo); + bool loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInfo &exeInfo); // Miscellaneous methods uint activeSounds() const; ///< How many active sounds are playing? void stopSounds(); ///< Stops all sounds diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp index b0cc400e4e..ea3893d957 100644 --- a/engines/agi/wagparser.cpp +++ b/engines/agi/wagparser.cpp @@ -173,7 +173,7 @@ bool WagFileParser::checkWagVersion(Common::SeekableReadStream &stream) { } } -bool WagFileParser::parse(const Common::FilesystemNode &node) { +bool WagFileParser::parse(const Common::FSNode &node) { WagProperty property; // Temporary property used for reading Common::SeekableReadStream *stream = NULL; // The file stream diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h index 89349a8ee2..c10be541cb 100644 --- a/engines/agi/wagparser.h +++ b/engines/agi/wagparser.h @@ -223,7 +223,7 @@ public: * @param filename Name of the file to be parsed. * @return True if parsed successfully, false otherwise. */ - bool parse(const Common::FilesystemNode &node); + bool parse(const Common::FSNode &node); /** * Get list of the loaded properties. |