[Scummvm-cvs-logs] SF.net SVN: scummvm: [28565] scummvm/trunk/engines/parallaction/disk_br.cpp

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sun Aug 12 15:54:31 CEST 2007


Revision: 28565
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28565&view=rev
Author:   peres001
Date:     2007-08-12 06:54:31 -0700 (Sun, 12 Aug 2007)

Log Message:
-----------
Fixed location retrieval.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk_br.cpp

Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp	2007-08-12 13:54:01 UTC (rev 28564)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp	2007-08-12 13:54:31 UTC (rev 28565)
@@ -87,15 +87,16 @@
 Script* DosDisk_br::loadLocation(const char *name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadLocation");
 
+	Common::File stream;
+
 	char path[PATH_LEN];
-	sprintf(path, "%s/%s/%s.loc", _partPath, _languageDir, name);
+	sprintf(path, "%s/%s/%s.slf", _partPath, _languageDir, name);
+	if (!stream.open(path)) {
+		sprintf(path, "%s/%s/%s.loc", _partPath, _languageDir, name);
+		if (!stream.open(path))
+			errorFileNotFound(path);
+	}
 
-	debugC(3, kDebugDisk, "DosDisk_br::loadLocation(%s): trying '%s'", name, path);
-
-	Common::File stream;
-	if (!stream.open(path))
-		errorFileNotFound(path);
-
 	return new Script(&stream, false);
 }
 


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