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

Some work on QFG1VGA (looks like a mix of SCI1 and SCI1.1)

Browse source 
svn-id: r42393
This commit is contained in:
Filippos Karapetis 2009-07-11 19:00:56 +00:00
parent 4f0888b8b6
commit f0892cdcbe
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/sci/gfx/gfx_resmgr.cpp
View file

@ -57,6 +57,11 @@ GfxResManager::GfxResManager(gfx_options_t *options, GfxDriver *driver, Resource
_portBounds = Common::Rect(0, 10, 320, 200); // default value, with a titlebar of 10px _portBounds = Common::Rect(0, 10, 320, 200); // default value, with a titlebar of 10px
_version = resManager->_volVersion; _version = resManager->_volVersion;
// Workaround for QFG1 VGA (has SCI 1.1 view data with SCI 1 compression)
if (_version == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) {
_version = SCI_VERSION_1_1;
}
if (!_resManager->isVGA()) { if (!_resManager->isVGA()) {
_staticPalette = gfx_sci0_pic_colors->getref(); _staticPalette = gfx_sci0_pic_colors->getref();
} else if (_version == SCI_VERSION_1_1) { } else if (_version == SCI_VERSION_1_1) {

10
engines/sci/resource.cpp
View file

@ -537,6 +537,12 @@ ResourceManager::ResourceManager(int version, int maxMemory) {
} }
} }
// Workaround for QFG1 VGA (has SCI 1.1 view data with SCI 1 compression)
if (version == SCI_VERSION_1 && !strcmp(((SciEngine*)g_engine)->getGameID(), "qfg1")) {
debug("Resmgr: Detected QFG1 VGA");
_isVGA = true;
}
_sciVersion = version; _sciVersion = version;
// temporary version printout - should be reworked later // temporary version printout - should be reworked later
switch (_sciVersion) { switch (_sciVersion) {
@ -721,7 +727,7 @@ int ResourceManager::detectMapVersion() {
} }
} }
if (file.isOpen() == false) { if (file.isOpen() == false) {
warning("Failed to open resource map file"); error("Failed to open resource map file");
return SCI_VERSION_AUTODETECT; return SCI_VERSION_AUTODETECT;
} }
// detection // detection
@ -801,7 +807,7 @@ int ResourceManager::detectVolVersion() {
} }
} }
if (file.isOpen() == false) { if (file.isOpen() == false) {
warning("Failed to open volume file"); error("Failed to open volume file");
return SCI_VERSION_AUTODETECT; return SCI_VERSION_AUTODETECT;
} }
// SCI0 volume format: {wResId wPacked+4 wUnpacked wCompression} = 8 bytes // SCI0 volume format: {wResId wPacked+4 wUnpacked wCompression} = 8 bytes