[Scummvm-cvs-logs] scummvm master -> 87b79f2124a1d13cfd3a62d9a526d1770a340b19

fuzzie fuzzie at fuzzie.org
Sun Jul 8 10:34:05 CEST 2012


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

Summary:
87b79f2124 COMPOSER: Fix parsing v1 book groups.


Commit: 87b79f2124a1d13cfd3a62d9a526d1770a340b19
    https://github.com/scummvm/scummvm/commit/87b79f2124a1d13cfd3a62d9a526d1770a340b19
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-07-08T01:28:44-07:00

Commit Message:
COMPOSER: Fix parsing v1 book groups.

This fixes bug #3539019.

Changed paths:
    engines/composer/composer.cpp



diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 556dad7..23a9d2f 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -381,11 +381,17 @@ void ComposerEngine::loadLibrary(uint id) {
 			filename = getStringFromConfig(_bookGroup, Common::String::format("%d", id));
 		filename = mangleFilename(filename);
 
+		// bookGroup is the basename of the path.
+		// TODO: tidy this up.
 		_bookGroup.clear();
 		for (uint i = 0; i < filename.size(); i++) {
-			if (filename[i] == '\\' || filename[i] == ':')
+			if (filename[i] == '~' || filename[i] == '/' || filename[i] == ':')
 				continue;
 			for (uint j = 0; j < filename.size(); j++) {
+				if (filename[j] == '/') {
+					_bookGroup.clear();
+					continue;
+				}
 				if (filename[j] == '.')
 					break;
 				_bookGroup += filename[j];






More information about the Scummvm-git-logs mailing list