From 848b9cda03ce5417ea2c89612fc411699643ff9c Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 11 Jul 2009 16:07:14 +0000 Subject: [PATCH] If we fail to auto-detect either the volume or the map version, set the one to be equal to the other svn-id: r42386 --- engines/sci/resource.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index a0aa40bcd57..b425c238764 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -470,6 +470,15 @@ ResourceManager::ResourceManager(int version, int maxMemory) { } else { _mapVersion = detectMapVersion(); _volVersion = detectVolVersion(); + if (_volVersion == 0 && _mapVersion > 0) { + warning("Volume version not detected, but map version has been detected. Setting volume version to map version"); + _volVersion = _mapVersion; + } + + if (_mapVersion == 0 && _volVersion > 0) { + warning("Map version not detected, but volume version has been detected. Setting map version to volume version"); + _mapVersion = _volVersion; + } } debug("Using resource map version %d %s", _mapVersion, versionNames[_mapVersion]); debug("Using volume version %d %s", _volVersion, versionNames[_volVersion]);