[Scummvm-cvs-logs] SF.net SVN: scummvm:[39170] scummvm/trunk/engines/sci/scicore/resource.cpp

gregfrieger at users.sourceforge.net gregfrieger at users.sourceforge.net
Sat Mar 7 02:08:35 CET 2009


Revision: 39170
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39170&view=rev
Author:   gregfrieger
Date:     2009-03-07 01:08:34 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Use map/volume versions from detection.cpp if set

Modified Paths:
--------------
    scummvm/trunk/engines/sci/scicore/resource.cpp

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-03-07 00:59:38 UTC (rev 39169)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-03-07 01:08:34 UTC (rev 39170)
@@ -380,18 +380,23 @@
 	_memoryLocked = 0;
 	_memoryLRU = 0;
 	_LRU.clear();
-
 	_resMap.clear();
 	_sources = NULL;
 	_sciVersion = version;
 
 	addAppropriateSources();
-	_mapVersion = detectMapVersion();
-	debug("Detected resource map:%d %s", _mapVersion, sci_version_types[_mapVersion]);
-	_volVersion = detectVolVersion();
-	debug("Detected volume :%d %s", _volVersion, sci_version_types[_volVersion]);
+
+	if (version != SCI_VERSION_AUTODETECT) {
+		_mapVersion = version;
+		_volVersion = version;
+	} else {
+		_mapVersion = detectMapVersion();
+		_volVersion = detectVolVersion();
+	}
+	debug("Using resource map version %d %s", _mapVersion, sci_version_types[_mapVersion]);
+	debug("Using volume version %d %s", _volVersion, sci_version_types[_volVersion]);
+
 	scanNewSources(_sources);
-
 	if (version == SCI_VERSION_AUTODETECT)
 		switch (_mapVersion) {
 		case SCI_VERSION_0:


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