aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-02-09 10:20:15 -0600
committerColin Snover2017-04-23 13:07:25 -0500
commit8aed6759e4a387981a9d35604fa33a38bf0fc057 (patch)
tree3364193b49107e05815cbf49085f4b2ee2ad8c50
parent88f020c7d47b4e35a09e9cc1f2a5209acecb3a7e (diff)
downloadscummvm-rg350-8aed6759e4a387981a9d35604fa33a38bf0fc057.tar.gz
scummvm-rg350-8aed6759e4a387981a9d35604fa33a38bf0fc057.tar.bz2
scummvm-rg350-8aed6759e4a387981a9d35604fa33a38bf0fc057.zip
SCI32: Remove incomplete SCI3 detection warning
Map format is the same as SCI2/2.1 and volume format is detected correctly as SCI3.
-rw-r--r--engines/sci/resource.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index d71f4353da..f6486acff7 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -903,12 +903,6 @@ void ResourceManager::init() {
_mapVersion = detectMapVersion();
_volVersion = detectVolVersion();
- // TODO/FIXME: Remove once SCI3 resource detection is finished
- if ((_mapVersion == kResVersionSci3 || _volVersion == kResVersionSci3) && (_mapVersion != _volVersion)) {
- warning("FIXME: Incomplete SCI3 detection: setting map and volume version to SCI3");
- _mapVersion = _volVersion = kResVersionSci3;
- }
-
if ((_volVersion == kResVersionUnknown) && (_mapVersion != kResVersionUnknown)) {
warning("Volume version not detected, but map version has been detected. Setting volume version to map version");
_volVersion = _mapVersion;