thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: detecting hires for SCI2+ games, qfg4cd is sci2.1 but still 320x200

Browse source 
svn-id: r47651
This commit is contained in:
Martin Kiewitz 2010-01-28 21:01:57 +00:00
parent 3c46bc33aa
commit 9e511e0751
3 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
engines/sci/resource.cpp
View file

@ -1859,6 +1859,35 @@ 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_LE_UINT16(res->data) == 0x0e) {
// SCI32 picture
uint16 width = READ_LE_UINT16(res->data + 14);
uint16 height = READ_LE_UINT16(res->data + 16);
if ((width == 320) && ((height == 190) || (height == 200)))
return false;
if ((width >= 600) || (height >= 400))
return true;
}
}
}
warning("resMan: Couldn't detect hires");
return false;
#else
error("no sci32 support");
#endif
}
// Functions below are based on PD code by Brian Provinciano (SCI Studio)
bool ResourceManager::hasOldScriptHeader() {
Resource *res = findResource(ResourceId(kResourceTypeScript, 0), 0);

2
engines/sci/resource.h
View file

@ -284,6 +284,8 @@ public:
*/
void addNewGMPatch(Common::String gameId);
bool detectHires();
protected:
// Maximum number of bytes to allow being allocated for resources
// Note: maxMemory will not be interpreted as a hard limit, only as a restriction

18
engines/sci/sci.cpp
View file

@ -126,13 +126,19 @@ Common::Error SciEngine::run() {
// Initialize graphics-related parts
Screen *screen = 0;
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2_1)
screen = new Screen(_resMan, 640, 480, false); // invokes initGraphics()
else
#endif
screen = new Screen(_resMan, 320, 200, upscaledHires); // invokes initGraphics()
bool isHires = _resMan->detectHires();
#ifdef ENABLE_SCI32
// If SCI2.1+ games are lowres (e.g. qfg4/cd), switch to upscaled hires mode
if ((!isHires) && (getSciVersion() >= SCI_VERSION_2_1))
upscaledHires = true;
#endif
// invokes initGraphics()
if (isHires)
screen = new Screen(_resMan, 640, 480, false);
else
screen = new Screen(_resMan, 320, 200, upscaledHires);
SciPalette *palette = new SciPalette(_resMan, screen);
Cursor *cursor = new Cursor(_resMan, palette, screen);