[Scummvm-cvs-logs] SF.net SVN: scummvm:[34451] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Sep 8 20:48:40 CEST 2008


Revision: 34451
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34451&view=rev
Author:   lordhoto
Date:     2008-09-08 18:48:39 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
Fixed LoL file loading regression.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/resource.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2008-09-08 14:38:07 UTC (rev 34450)
+++ scummvm/trunk/engines/kyra/lol.cpp	2008-09-08 18:48:39 UTC (rev 34451)
@@ -241,27 +241,21 @@
 
 void LoLEngine::setupPrologueData(bool load) {
 	static const char * const fileList[] = {
-		"xxx/general.pak",
-		"xxx/introvoc.pak",
-		"xxx/startup.pak",
-		"xxx/intro1.pak",
-		"xxx/intro2.pak",
-		"xxx/intro3.pak",
-		"xxx/intro4.pak",
-		"xxx/intro5.pak",
-		"xxx/intro6.pak",
-		"xxx/intro7.pak",
-		"xxx/intro8.pak",
-		"xxx/intro9.pak"
+		"general.pak", "introvoc.pak", "startup.pak", "intro1.pak",
+		"intro2.pak", "intro3.pak", "intro4.pak", "intro5.pak",
+		"intro6.pak", "intro7.pak", "intro8.pak", "intro9.pak"
 	};
 
-	char filepath[32];
-	char *filename = filepath;
+	char filename[32];
 	for (uint i = 0; i < ARRAYSIZE(fileList); ++i) {
-		strcpy(filename, fileList[i]);
-		memcpy(filename, _languageExt[_lang], 3);
-		if (!_flags.isTalkie)
-			filename += 4;		
+		filename[0] = '\0';
+
+		if (_flags.isTalkie) {
+			strcpy(filename, _languageExt[_lang]);
+			strcat(filename, "/");
+		}
+
+		strcat(filename, fileList[i]);
 		
 		if (load) {
 			if (!_res->loadPakFile(filename))

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-09-08 14:38:07 UTC (rev 34450)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-09-08 18:48:39 UTC (rev 34451)
@@ -38,7 +38,7 @@
 Resource::Resource(KyraEngine_v1 *vm) : _archiveCache(), _files(), _archiveFiles(new Common::SearchSet()), _protectedFiles(new Common::SearchSet()), _loaders(), _vm(vm) {
 	initializeLoaders();
 
-	Common::SharedPtr<Common::Archive> path(new Common::FSDirectory(ConfMan.get("path")));
+	Common::SharedPtr<Common::Archive> path(new Common::FSDirectory(ConfMan.get("path"), 2));
 	Common::SharedPtr<Common::Archive> extrapath(new Common::FSDirectory(ConfMan.get("extrapath")));
 
 	_files.add("path", path, 4);


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




More information about the Scummvm-git-logs mailing list