[Scummvm-cvs-logs] SF.net SVN: scummvm:[43670] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 43670
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43670&view=rev
Author:   Kirben
Date:     2009-08-23 14:51:04 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
Fix Moonbase Commander startup.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v100he.cpp
    scummvm/trunk/engines/scumm/he/script_v72he.cpp
    scummvm/trunk/engines/scumm/vars.cpp

Modified: scummvm/trunk/engines/scumm/he/script_v100he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v100he.cpp	2009-08-23 13:43:58 UTC (rev 43669)
+++ scummvm/trunk/engines/scumm/he/script_v100he.cpp	2009-08-23 14:51:04 UTC (rev 43670)
@@ -629,6 +629,7 @@
 		}
 		break;
 	case 132:
+		debug(0, "o100_arrayOps: case 132");
 		// TODO: Used by Moonbase Commander
 		fetchScriptWord();
 		fetchScriptWord();

Modified: scummvm/trunk/engines/scumm/he/script_v72he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v72he.cpp	2009-08-23 13:43:58 UTC (rev 43669)
+++ scummvm/trunk/engines/scumm/he/script_v72he.cpp	2009-08-23 14:51:04 UTC (rev 43670)
@@ -1398,11 +1398,6 @@
 	copyScriptString(buffer, sizeof(buffer));
 	debug(1, "Original filename %s", buffer);
 
-	// HACK: INI filename seems to get reset, corruption elsewhere?
-	if (_game.id == GID_MOONBASE && buffer[0] == 0) {
-		strcpy((char *)buffer, "moonbase.ini");
-	}
-
 	const char *filename = (char *)buffer + convertFilePath(buffer, sizeof(buffer));
 	debug(1, "Final filename to %s", filename);
 
@@ -1823,7 +1818,12 @@
 	case 77: // HE 100
 	case 7: // string
 		writeVar(0, 0);
-		if (!strcmp((char *)option, "SaveGamePath")) {
+		if (!strcmp((char *)option, "HE3File")) {
+			Common::String fileName = generateFilename(-3);
+			int len = resStrLen((const byte *)fileName.c_str());
+			data = defineArray(0, kStringArray, 0, 0, 0, len);
+			memcpy(data, fileName.c_str(), len);
+		} else if (!strcmp((char *)option, "SaveGamePath")) {
 			// We set SaveGamePath in order to detect where it used
 			// in convertFilePath and to avoid warning about invalid
 			// path in Macintosh verisons.

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2009-08-23 13:43:58 UTC (rev 43669)
+++ scummvm/trunk/engines/scumm/vars.cpp	2009-08-23 14:51:04 UTC (rev 43670)
@@ -312,6 +312,7 @@
 void ScummEngine_v90he::setupScummVars() {
 	ScummEngine_v80he::setupScummVars();
 
+	VAR_TIMER = 97;
 	VAR_SCRIPT_CYCLE = 103;
 	VAR_NUM_SCRIPT_CYCLES = 104;
 


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