diff options
| author | Colin Snover | 2016-10-30 15:08:09 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-11-02 15:43:07 -0500 |
| commit | ee4b172d54ee3a428438d8e48da77044e9822935 (patch) | |
| tree | ddc687a68e28c76afd78cbfe5492548344eaf536 | |
| parent | e8c429832f7b6393f853fd6d9ce8ba2e62f6a93c (diff) | |
| download | scummvm-rg350-ee4b172d54ee3a428438d8e48da77044e9822935.tar.gz scummvm-rg350-ee4b172d54ee3a428438d8e48da77044e9822935.tar.bz2 scummvm-rg350-ee4b172d54ee3a428438d8e48da77044e9822935.zip | |
SCI: Remove old SCI32 hires detection heuristic
| -rw-r--r-- | engines/sci/graphics/screen.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/resource.cpp | 32 | ||||
| -rw-r--r-- | engines/sci/resource.h | 1 |
3 files changed, 0 insertions, 38 deletions
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 23e92ef6a9..de6df39bb9 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -84,11 +84,6 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) { } } - if (_resMan->detectHires()) { - _scriptWidth = 640; - _scriptHeight = 480; - } - // if not yet set, set those to script-width/height if (!_width) _width = _scriptWidth; diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 8826b0625a..5b57eed123 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -2459,38 +2459,6 @@ void ResourceManager::detectSciVersion() { } } -bool ResourceManager::detectHires() { - // SCI 1.1 and prior is never hires - if (getSciVersion() <= SCI_VERSION_1_1) - return false; - -#ifdef ENABLE_SCI32 - for (int i = 0; i < 32768; i++) { - Resource *res = findResource(ResourceId(kResourceTypePic, i), 0); - - if (res) { - if (READ_SCI11ENDIAN_UINT16(res->data) == 0x0e) { - // SCI32 picture - uint16 width = READ_SCI11ENDIAN_UINT16(res->data + 10); - uint16 height = READ_SCI11ENDIAN_UINT16(res->data + 12); - // Surely lowres (e.g. QFG4CD) - if ((width == 320) && ((height == 190) || (height == 200))) - return false; - // Surely hires - if ((width >= 600) || (height >= 400)) - return true; - } - } - } - - // We haven't been able to find hires content - - return false; -#else - error("no sci32 support"); -#endif -} - bool ResourceManager::detectFontExtended() { Resource *res = findResource(ResourceId(kResourceTypeFont, 0), 0); diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 70db5909b7..928d571dbc 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -424,7 +424,6 @@ private: public: #endif - bool detectHires(); // Detects, if standard font of current game includes extended characters (>0x80) bool detectFontExtended(); // Detects, if SCI1.1 game uses palette merging |