[Scummvm-cvs-logs] scummvm master -> 913075df90307a5331870009e0b29bfc87103ef6

[bluegr]

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:
913075df90 ZVISION: Also handle paths in NEMESIS.ZIX for the DVD ver. of Nemesis


Commit: 913075df90307a5331870009e0b29bfc87103ef6
    https://github.com/scummvm/scummvm/commit/913075df90307a5331870009e0b29bfc87103ef6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-08T01:44:06+02:00

Commit Message:
ZVISION: Also handle paths in NEMESIS.ZIX for the DVD ver. of Nemesis

Changed paths:
    engines/zvision/file/search_manager.cpp



diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 80792b0..9f709dd 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -165,6 +165,11 @@ bool SearchManager::loadZix(const Common::String &name) {
 				if (path[i] == '\\')
 					path.setChar('/', i);
 
+			// Check if NEMESIS.ZIX/MEDIUM.ZIX refers to the znemesis folder, and
+			// check the game root folder instead
+			if (path.hasPrefix("znemesis/"))
+				path = Common::String(path.c_str() + 9);
+
 			// Check if INQUIS.ZIX refers to the ZGI folder, and check the game
 			// root folder instead
 			if (path.hasPrefix("zgi/"))