[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.237,2.238 scumm.cpp,1.410,1.411

kirben kirben at users.sourceforge.net
Thu Apr 7 17:39:19 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/scumm

Modified Files:
	script_v72he.cpp scumm.cpp 
Log Message:

HE99+ games store the base name is array 129, which is set on startup.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.237
retrieving revision 2.238
diff -u -d -r2.237 -r2.238
--- script_v72he.cpp	7 Apr 2005 10:54:35 -0000	2.237
+++ script_v72he.cpp	8 Apr 2005 00:38:12 -0000	2.238
@@ -1672,28 +1672,6 @@
 		debug(0,"Converted filename to %s", filename);
 	}
 
-	// Original games read path & filenames from INI file
-	// We only need to add the required game name
-	if (!strcmp((char *)filename,".he3")) {
-		// For freddicove (Unencrypted and Updated Ru)
-		memset(filename, 0, sizeof(filename));
-		sprintf((char *)filename, "%s.he3", _gameName.c_str());
-		debug(0,"New filename %s", filename);
-
-	} else if (!strcmp((char *)filename,".he7")) {
-		// For mustard
-		memset(filename, 0, sizeof(filename));
-		sprintf((char *)filename, "%s.he7", _gameName.c_str());
-		debug(0,"New filename %s", filename);
-
-	} else if (!strcmp((char *)filename,".HE9")) {
-		// For bb2demo
-		memset(filename, 0, sizeof(filename));
-		sprintf((char *)filename, "%s.he9", _gameName.c_str());
-		debug(0,"New filename %s", filename);
-
-	}
-
 	if (_substResFileNameIndex > 0) {
 		char buf1[128];
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- scumm.cpp	7 Apr 2005 11:43:38 -0000	1.410
+++ scumm.cpp	8 Apr 2005 00:38:12 -0000	1.411
@@ -1636,6 +1636,12 @@
 	ScummEngine_v90he::scummInit();
 
 	_hePalettes = (uint8 *)malloc((_numPalettes + 1) * 1024);
+
+	// Array 129 is set to base name
+	int len = resStrLen((const byte *)_gameName.c_str()) + 1;
+	ArrayHeader *ah = defineArray(129, kStringArray, 0, 0, 0, len);
+	memcpy(ah->data, _gameName.c_str(), len);
+
 }
 
 void ScummEngine::setupMusic(int midi) {





More information about the Scummvm-git-logs mailing list