thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Fix Mac icon bar vertical positioning

Browse source
This commit is contained in:
Matthew Hoops 2011-02-17 13:28:34 -05:00
parent 266806d892
commit d3e3eca6a3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/sci/graphics/maciconbar.cpp
View file

@ -29,6 +29,7 @@
#include "sci/engine/state.h"
#include "sci/graphics/maciconbar.h"
#include "sci/graphics/palette.h"
#include "sci/graphics/screen.h"
#include "common/memstream.h"
#include "common/system.h"
@ -58,7 +59,8 @@ void GfxMacIconBar::drawIcons() {
Graphics::Surface *surf = pict->decodeImage(stream, pal);
remapColors(surf, pal);
g_system->copyRectToScreen((byte *)surf->pixels, surf->pitch, lastX, 200, MIN<uint32>(surf->w, 320 - lastX), surf->h);
g_system->copyRectToScreen((byte *)surf->pixels, surf->pitch, lastX,
g_sci->_gfxScreen->getHeight() + 2, MIN<uint32>(surf->w, 320 - lastX), surf->h);
lastX += surf->w;
surf->free();

6
engines/sci/graphics/screen.cpp
View file

@ -132,10 +132,12 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
if (g_sci->hasMacIconBar()) {
// For SCI1.1 Mac games with the custom icon bar, we need to expand the screen
// to accommodate for the icon bar. Of course, both KQ6 and QFG1 VGA differ in size.
// We add 2 to the height of the icon bar to add a buffer between the screen and the
// icon bar (as did the original interpreter).
if (g_sci->getGameId() == GID_KQ6)
initGraphics(_displayWidth, _displayHeight + 26, _displayWidth > 320);
initGraphics(_displayWidth, _displayHeight + 26 + 2, _displayWidth > 320);
else if (g_sci->getGameId() == GID_FREDDYPHARKAS)
initGraphics(_displayWidth, _displayHeight + 28, _displayWidth > 320);
initGraphics(_displayWidth, _displayHeight + 28 + 2, _displayWidth > 320);
else
error("Unknown SCI1.1 Mac game");
} else