[Scummvm-cvs-logs] SF.net SVN: scummvm:[42393] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 42393
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42393&view=rev
Author:   thebluegr
Date:     2009-07-11 19:00:56 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
Some work on QFG1VGA (looks like a mix of SCI1 and SCI1.1)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-11 18:14:55 UTC (rev 42392)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-11 19:00:56 UTC (rev 42393)
@@ -57,6 +57,11 @@
 	_portBounds = Common::Rect(0, 10, 320, 200);	// default value, with a titlebar of 10px
 	_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()) {
 		_staticPalette = gfx_sci0_pic_colors->getref();
 	} else if (_version == SCI_VERSION_1_1) {

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-07-11 18:14:55 UTC (rev 42392)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-07-11 19:00:56 UTC (rev 42393)
@@ -537,6 +537,12 @@
 		}
 	}
 
+	// 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;
 	// temporary version printout - should be reworked later
 	switch (_sciVersion) {
@@ -721,7 +727,7 @@
 		}
 	}
 	if (file.isOpen() == false) {
-		warning("Failed to open resource map file");
+		error("Failed to open resource map file");
 		return SCI_VERSION_AUTODETECT;
 	}
 	// detection
@@ -801,7 +807,7 @@
 		}
 	}
 	if (file.isOpen() == false) {
-		warning("Failed to open volume file");
+		error("Failed to open volume file");
 		return SCI_VERSION_AUTODETECT;
 	}
 	// SCI0 volume format:  {wResId wPacked+4 wUnpacked wCompression} = 8 bytes


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.