SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect

as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449

2 files changed, 3 insertions, 16 deletions

diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index fbae7105c9..d79ae3fef9 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -57,11 +57,6 @@ GfxResManager::GfxResManager(gfx_options_t *options, GfxDriver *driver, Resource
 	_portBounds = Common::Rect(0, 10, 320, 200);	// default value, with a titlebar of 10px
 	_version = resManager->sciVersion();
 
-	// 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) {
@@ -537,7 +532,8 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) {
 		int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
 		
 		if (!_resManager->isVGA()) {
-			int pal = (_version == SCI_VERSION_0) ? -1 : palette;
+			// TODO: Check which versions this applies to
+			int pal = (_version < SCI_VERSION_1_EARLY) ? -1 : palette;
 			view = getEGAView(resid, viewRes->data, viewRes->size, pal);
 		} else {
 			if (_version < SCI_VERSION_1_1)
@@ -679,7 +675,7 @@ gfx_pixmap_t *GfxResManager::getCursor(int num) {
 		}
 
 		gfx_pixmap_t *cursor = gfxr_draw_cursor(GFXR_RES_ID(GFX_RESOURCE_TYPE_CURSOR, num),
-										cursorRes->data, cursorRes->size, _version != SCI_VERSION_0);
+										cursorRes->data, cursorRes->size, _version > SCI_VERSION_01);
 
 		if (!cursor)
 			return NULL;
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index 5cd5d018cc..75072f5ede 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -231,15 +231,6 @@ public:
 	int calculatePic(gfxr_pic_t *scaled_pic, gfxr_pic_t *unscaled_pic,
 			int flags, int default_palette, int nr);
 
-	/**
-	 * Determines whether support for pointers with more than two colors
-	 * is required.
-	 *
-	 * @return	false if no support for multi-colored pointers is required,
-	 * 			true otherwise
-	 */
-	bool multicoloredPointers() { return _version > SCI_VERSION_1; }
-
 
 	/**
 	 * Frees all resources currently allocated.