[Scummvm-cvs-logs] SF.net SVN: scummvm:[42386] scummvm/trunk/engines/sci/resource.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Jul 11 18:07:14 CEST 2009
Revision: 42386
http://scummvm.svn.sourceforge.net/scummvm/?rev=42386&view=rev
Author: thebluegr
Date: 2009-07-11 16:07:14 +0000 (Sat, 11 Jul 2009)
Log Message:
-----------
If we fail to auto-detect either the volume or the map version, set the one to be equal to the other
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.cpp
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-07-11 15:00:40 UTC (rev 42385)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-07-11 16:07:14 UTC (rev 42386)
@@ -470,6 +470,15 @@
} 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]);
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