[Scummvm-cvs-logs] SF.net SVN: scummvm:[51137] scummvm/trunk/engines/sci/graphics/frameout.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 51137
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51137&view=rev
Author:   m_kiewitz
Date:     2010-07-22 11:11:31 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
SCI: removing priority hack for gk1hires

also fixing base picture drawing

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/frameout.cpp

Modified: scummvm/trunk/engines/sci/graphics/frameout.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-07-22 10:58:14 UTC (rev 51136)
+++ scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-07-22 11:11:31 UTC (rev 51137)
@@ -198,14 +198,6 @@
 				if (readSelectorValue(_segMan, itemObject, SELECTOR(fixPriority)) == 0)
 					itemEntry->priority = itemEntry->y;
 
-				if (gameId == GID_GK1) {
-					if ((itemEntry->viewId == 11000) && (itemEntry->loopNo == 0) && (itemEntry->celNo == 0) && (itemEntry->priority == 1)) {
-						itemEntry->priority = 0; // HACK for gk1 hires main menu
-					}
-					if ((itemEntry->viewId == 10100) && (itemEntry->priority == 0)) {
-						itemEntry->priority = 1; // HACK for gk1 hires main menu
-					}
-				}
 				itemEntry->signal = readSelectorValue(_segMan, itemObject, SELECTOR(signal));
 				itemEntry->scaleX = readSelectorValue(_segMan, itemObject, SELECTOR(scaleX));
 				itemEntry->scaleY = readSelectorValue(_segMan, itemObject, SELECTOR(scaleY));
@@ -226,7 +218,7 @@
 
 		if (planePicture) {
 			// Show base picture
-			planePicture->drawSci32Vga(0, 0, 0, planePictureMirrored);
+			planePicture->drawSci32Vga(0, planePicture->getSci32celX(0), planePicture->getSci32celY(0), planePictureMirrored);
 			// Allocate memory for picture cels
 			pictureCels = (FrameoutEntry *)malloc(planePicture->getSci32celCount() * sizeof(FrameoutEntry));
 			// Add following cels to the itemlist


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