[Scummvm-cvs-logs] scummvm master -> b0ce97bccf77a9bf1690816df29e14778bfb1d3e

[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:
23d9d5b509 WINTERMUTE: Remove fixedPath snippet
b0ce97bccf Merge pull request #358 from tobiatesan/fix_wme_base_disk


Commit: 23d9d5b509f290c44c6e2280d287da96eeabfe67
    https://github.com/scummvm/scummvm/commit/23d9d5b509f290c44c6e2280d287da96eeabfe67
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2013-07-13T03:40:01-07:00

Commit Message:
WINTERMUTE: Remove fixedPath snippet

fixedPath is apparently never used anywhere else in the class and this
loop can cause the next one to never get to run.

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp



diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 3c1ecc7..5ffb06f 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -66,12 +66,6 @@ static Common::FSNode getNodeForRelativePath(const Common::String &filename) {
 		const Common::FSNode gameDataDir(ConfMan.get("path"));
 		Common::FSNode curNode = gameDataDir;
 
-		Common::String fixedPath = "";
-		while (!path.empty()) {
-			fixedPath += path.nextToken() + "/";
-		}
-		fixedPath.deleteLastChar();
-
 		// Parse all path-elements
 		while (!path.empty()) {
 			// Get the next path-component by slicing on '\\'


Commit: b0ce97bccf77a9bf1690816df29e14778bfb1d3e
    https://github.com/scummvm/scummvm/commit/b0ce97bccf77a9bf1690816df29e14778bfb1d3e
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-07-31T09:05:53-07:00

Commit Message:
Merge pull request #358 from tobiatesan/fix_wme_base_disk

WINTERMUTE: Remove fixedPath snippet

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp