aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-18 18:49:06 +0000
committerMartin Kiewitz2010-06-18 18:49:06 +0000
commit8c8ce14164c21210e05115ab6a8f4f3f8a1d0e20 (patch)
treea8ab39b5d8619a442a71a45c5bdda293d9ff9098
parent3197dfc033adba2ced19dcaf3762a5b2c0ad2452 (diff)
downloadscummvm-rg350-8c8ce14164c21210e05115ab6a8f4f3f8a1d0e20.tar.gz
scummvm-rg350-8c8ce14164c21210e05115ab6a8f4f3f8a1d0e20.tar.bz2
scummvm-rg350-8c8ce14164c21210e05115ab6a8f4f3f8a1d0e20.zip
SCI: not using views coming from patch files anymore for detecting view type
svn-id: r50027
-rw-r--r--engines/sci/resource.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 075d104f3e..a4eff573ab 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1697,6 +1697,10 @@ ViewType ResourceManager::detectViewType() {
Resource *res = findResource(ResourceId(kResourceTypeView, i), 0);
if (res) {
+ // Skip views coming from patch files
+ if (res->_source->getSourceType() == kSourcePatch)
+ continue;
+
switch (res->data[1]) {
case 128:
// If the 2nd byte is 128, it's a VGA game