[Scummvm-cvs-logs] scummvm master -> 35a5918adad70995557a439f23b5aed24f4cd248

eriktorbjorn eriktorbjorn at telia.com
Sun Jul 3 22:21:10 CEST 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2ac0b7d7ae PRINCE: Correct search path to voices/databank.ptc
35a5918ada PRINCE: Prefix the names of the data archives


Commit: 2ac0b7d7aee73ff385ca0aca0ae8916f7088f89d
    https://github.com/scummvm/scummvm/commit/2ac0b7d7aee73ff385ca0aca0ae8916f7088f89d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-07-03T22:20:52+02:00

Commit Message:
PRINCE: Correct search path to voices/databank.ptc

At least in my copy, the voices directory is on the same level as
the other directories. (Though the whole thing is inside a
directory called "data", so maybe that's where that came from?)

Changed paths:
    engines/prince/prince.cpp



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index a1386c6..e220f47 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -226,8 +226,8 @@ void PrinceEngine::init() {
 		error("Can't open all/databank.ptc");
 
 	PtcArchive *voices = new PtcArchive();
-	if (!voices->open("data/voices/databank.ptc"))
-		error("Can't open data/voices/databank.ptc");
+	if (!voices->open("voices/databank.ptc"))
+		error("Can't open voices/databank.ptc");
 
 	PtcArchive *sound = new PtcArchive();
 	if (!sound->open("sound/databank.ptc"))


Commit: 35a5918adad70995557a439f23b5aed24f4cd248
    https://github.com/scummvm/scummvm/commit/35a5918adad70995557a439f23b5aed24f4cd248
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-07-03T22:20:52+02:00

Commit Message:
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.

Changed paths:
    engines/prince/prince.cpp



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index e220f47..fe5905b 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);
 	}






More information about the Scummvm-git-logs mailing list