diff options
| author | Martin Kiewitz | 2010-07-22 11:11:31 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-22 11:11:31 +0000 |
| commit | ed1ae39e4685e000cac0810ffeea01356fa55146 (patch) | |
| tree | cc7591c35006007850f7e0c659112cb24560d3b5 /engines/sci | |
| parent | 15ef4b23a0f864a8788be57a118f75bdc6e383fa (diff) | |
| download | scummvm-rg350-ed1ae39e4685e000cac0810ffeea01356fa55146.tar.gz scummvm-rg350-ed1ae39e4685e000cac0810ffeea01356fa55146.tar.bz2 scummvm-rg350-ed1ae39e4685e000cac0810ffeea01356fa55146.zip | |
SCI: removing priority hack for gk1hires
also fixing base picture drawing
svn-id: r51137
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
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 |