From ed1ae39e4685e000cac0810ffeea01356fa55146 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Thu, 22 Jul 2010 11:11:31 +0000
Subject: SCI: removing priority hack for gk1hires

also fixing base picture drawing

svn-id: r51137
---
 engines/sci/graphics/frameout.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'engines/sci/graphics')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 5ec29887db..c6956e97ca 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -198,14 +198,6 @@ void GfxFrameout::kernelFrameout() {
 				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 @@ void GfxFrameout::kernelFrameout() {
 
 		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
-- 
cgit v1.2.3