[Scummvm-cvs-logs] SF.net SVN: scummvm:[43548] scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp

[waltervn at users.sourceforge.net]

Revision: 43548
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43548&view=rev
Author:   waltervn
Date:     2009-08-19 21:09:10 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
SCI: Cleanup.

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-08-19 21:08:17 UTC (rev 43547)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-08-19 21:09:10 UTC (rev 43548)
@@ -530,28 +530,25 @@
 			return NULL;
 
 		int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
-		
-		if (!_resManager->isVGA()) {
+		ViewType viewType = _resManager->getViewType();
+
+		if (viewType == kViewEga) {
 			int pal = (_version <= SCI_VERSION_01) ? -1 : palette;
 			view = getEGAView(resid, viewRes->data, viewRes->size, pal);
 		} else {
-			if (_version < SCI_VERSION_1_1)
-				view = getVGAView(resid, viewRes->data, viewRes->size, _staticPalette, false);
-			else
-				view = getVGAView(resid, viewRes->data, viewRes->size, 0, true);
+			view = getVGAView(resid, viewRes->data, viewRes->size, _staticPalette, viewType == kViewVga11);
 
-			if (!view->palette) {
-				view->palette = new Palette(_staticPalette->size());
-				view->palette->name = "interpreter_get_view";
-			}
-
-			// Palettize view
-			for (unsigned i = 0; i < MIN(view->palette->size(), _staticPalette->size()); i++) {
-				const PaletteEntry& vc = view->palette->getColor(i);
-				if (vc.r == 0 && vc.g == 0 && vc.b == 0) {
-					const PaletteEntry& sc = _staticPalette->getColor(i);
-					view->palette->setColor(i, sc.r, sc.g, sc.b);
+			if (view->palette) {
+				// Palettize view
+				for (unsigned i = 0; i < MIN(view->palette->size(), _staticPalette->size()); i++) {
+					const PaletteEntry& vc = view->palette->getColor(i);
+					if (vc.r == 0 && vc.g == 0 && vc.b == 0) {
+						const PaletteEntry& sc = _staticPalette->getColor(i);
+						view->palette->setColor(i, sc.r, sc.g, sc.b);
+					}
 				}
+			} else {
+				view->palette = _staticPalette->getref();
 			}
 		}
 


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