[Scummvm-cvs-logs] scummvm master -> 1ff4c02c807cc815270ac9579b7e7c0bd651326d

[somaen]

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:
6ca8d22fb1 WINTERMUTE: Fixed parentFolder name check when testing for "language"/"languages", Fix bug #6655 (Dead City - hotspot te
1ff4c02c80 Merge pull request #586 from jammm/master


Commit: 6ca8d22fb100f2b3f3549b8785801ffd470135b9
    https://github.com/scummvm/scummvm/commit/6ca8d22fb100f2b3f3549b8785801ffd470135b9
Author: jammm (jem456.vasishta at gmail.com)
Date: 2015-02-22T02:54:45+05:30

Commit Message:
WINTERMUTE: Fixed parentFolder name check when testing for "language"/"languages", Fix bug #6655 (Dead City - hotspot text issue)

Fixed Wintermute incorretly parsing folder names with trailing \

(Windows-only issue)
It seems that calling getParent returns trailing '\' which is absent on POSIX based file systems but not on Windows. This causes Wintermute to load outline_red2.font from russian.dcp, which is not desired. This is fixed by calling it->getName() directly, which returns the folder name (without the trailing '\').

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 58684b6..05830ff 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -227,7 +227,7 @@ bool BaseFileManager::registerPackages() {
 
 			// Again, make the parent's name all lowercase to avoid any case
 			// issues.
-			Common::String parentName = fileIt->getParent().getName();
+			Common::String parentName = it->getName();
 			parentName.toLowercase();
 
 			// Avoid registering all the language files


Commit: 1ff4c02c807cc815270ac9579b7e7c0bd651326d
    https://github.com/scummvm/scummvm/commit/1ff4c02c807cc815270ac9579b7e7c0bd651326d
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2015-02-24T17:53:39+01:00

Commit Message:
Merge pull request #586 from jammm/master

WINTERMUTE: Fixed parentFolder name check, Fix bug #6655 (Dead City - hotspot text issue)

Changed paths:
    engines/wintermute/base/base_file_manager.cpp