aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2016-07-03 22:19:01 +0200
committerTorbjörn Andersson2016-07-03 22:20:52 +0200
commit35a5918adad70995557a439f23b5aed24f4cd248 (patch)
tree069553d9414dc75c0a855b920a07512cd43eaab4
parent2ac0b7d7aee73ff385ca0aca0ae8916f7088f89d (diff)
downloadscummvm-rg350-35a5918adad70995557a439f23b5aed24f4cd248.tar.gz
scummvm-rg350-35a5918adad70995557a439f23b5aed24f4cd248.tar.bz2
scummvm-rg350-35a5918adad70995557a439f23b5aed24f4cd248.zip
PRINCE: Prefix the names of the data archives
This avoids a conflict between the "all" directory and the "all" archive, if the directory happens to be named in all lower case. While it isn't on the CD, we shouldn't introduce case sensitivity in the file names if we can avoid it.
-rw-r--r--engines/prince/prince.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index e220f473c8..fe5905bcd0 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -241,9 +241,12 @@ void PrinceEngine::init() {
SearchMan.addSubDirectoryMatching(gameDataDir, "all");
- SearchMan.add("all", all);
- SearchMan.add("voices", voices);
- SearchMan.add("sound", sound);
+ // Prefix the archive names, so that "all" doesn't conflict with the
+ // "all" directory, if that happens to be named in all lower case.
+ // It isn't on the CD, but we should try to stay case-insensitive.
+ SearchMan.add("_all", all);
+ SearchMan.add("_voices", voices);
+ SearchMan.add("_sound", sound);
if (getLanguage() != Common::PL_POL && getLanguage() != Common::DE_DEU) {
SearchMan.add("translation", translation);
}