Skip to content

Commit

Permalink
AURORA: Use FilePath::isPOSIXAbsolute() in indexArchive()
Browse files Browse the repository at this point in the history
This should fix #421.
  • Loading branch information
DrMcCoy committed Feb 9, 2019
1 parent 0b4b0eb commit abd316a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/aurora/resman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ ResourceManager::KnownArchive *ResourceManager::findArchive(const Common::UStrin
}

ResourceManager::KnownArchive *ResourceManager::findArchive(Common::UString file, KnownArchives &archives) {
file = (Common::FilePath::isAbsolute(file) ? "" : "/") + file;
file = (Common::FilePath::isPOSIXAbsolute(file) ? "" : "/") + file;
file = Common::FilePath::normalize(file, false).toLower();

for (KnownArchives::iterator a = archives.begin(); a != archives.end(); ++a) {
Expand Down
8 changes: 6 additions & 2 deletions src/aurora/resman.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ class ResourceManager : public Common::Singleton<ResourceManager> {

/** Add all the resources of an archive to the resource manager.
*
* @param file The name of the archive file to index.
* @param file The name of the archive file to index. If the name starts with a "/",
* the file path must be in the root of the game data directory. Otherwise,
* subfolders are considered as well.
* @param priority The priority these files have over others of the same name
* and type. Higher number = higher priority. 0 means blacklisted.
* @param changeID If given, record the collective changes done here.
Expand All @@ -127,7 +129,9 @@ class ResourceManager : public Common::Singleton<ResourceManager> {

/** Add all the resources of an archive to the resource manager.
*
* @param file The name of the archive file to index.
* @param file The name of the archive file to index. If the name starts with a "/",
* the file path must be in the root of the game data directory. Otherwise,
* subfolders are considered as well.
* @param priority The priority these files have over others of the same name
* and type. Higher number = higher priority. 0 means blacklisted.
* @param password Use this password to decrypt the archive file, if necessary.
Expand Down

0 comments on commit abd316a

Please sign in to comment.