[Scummvm-cvs-logs] SF.net SVN: scummvm:[43785] scummvm/branches/branch-1-0-0/engines/scumm/he

[Kirben at users.sourceforge.net]

Revision: 43785
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43785&view=rev
Author:   Kirben
Date:     2009-08-29 01:20:13 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
Backport fix for the default save game path setting in Macintosh versions of HE72+ games.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp
    scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp

Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp	2009-08-29 01:13:47 UTC (rev 43784)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp	2009-08-29 01:20:13 UTC (rev 43785)
@@ -129,9 +129,12 @@
 	} else if (dst[0] == '.' && dst[1] == '/') { // Game Data Path
 		// The default game data path is set to './' by ScummVM
 		r = 2;
-	} else if (dst[0] == '*' && dst[1] == '/') { // Save Game Path (HE72 - HE100)
+ 	} else if (dst[0] == '*' && dst[1] == '/') { // Save Game Path (Windows HE72 - HE100)
 		// The default save game path is set to '*/' by ScummVM
 		r = 2;
+ 	} else if (dst[0] == '*' && dst[1] == ':') { // Save Game Path (Macintosh HE72 - HE100)
+		// The default save game path is set to ':/' by ScummVM
+ 		r = 2;
 	} else if (dst[0] == 'c' && dst[1] == ':') { // Save Game Path (HE60 - HE71)
 		// The default save path is game path (DOS) or 'c:/hegames/' (Windows)
 		for (r = len; r != 0; r--) {

Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp	2009-08-29 01:13:47 UTC (rev 43784)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v72he.cpp	2009-08-29 01:20:13 UTC (rev 43785)
@@ -1823,7 +1823,10 @@
 			// in convertFilePath and to avoid warning about invalid
 			// path in Macintosh verisons.
 			data = defineArray(0, kStringArray, 0, 0, 0, 2);
-			memcpy(data, (const char *)"*\\", 2);
+			if (_game.platform == Common::kPlatformMacintosh)
+				memcpy(data, (const char *)"*:", 2);
+			else
+				memcpy(data, (const char *)"*\\", 2);
 		} else {
 			const char *entry = (ConfMan.get((char *)option).c_str());
 			int len = resStrLen((const byte *)entry);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.