From 18efc4476832a1799c304c38e74cdf667e869c7a Mon Sep 17 00:00:00 2001
From: Greg Frieger
Date: Sat, 7 Mar 2009 01:08:34 +0000
Subject: Use map/volume versions from detection.cpp if set

svn-id: r39170
---
 engines/sci/scicore/resource.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index e483af813c..aca8e23592 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -380,18 +380,23 @@ ResourceManager::ResourceManager(int version, int maxMemory) {
 	_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]);
-	scanNewSources(_sources);
 
+	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:
-- 
cgit v1.2.3