aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2011-02-17 13:28:34 -0500
committerMatthew Hoops2011-02-17 13:38:24 -0500
commitd3e3eca6a30d8aa9f23b1811b3ae86b8d2419b7f (patch)
tree8b6459dc073984848c1205424dfb147682a5aadc /engines
parent266806d8925330ec0d9e020fafffd74a2cb272e6 (diff)
downloadscummvm-rg350-d3e3eca6a30d8aa9f23b1811b3ae86b8d2419b7f.tar.gz
scummvm-rg350-d3e3eca6a30d8aa9f23b1811b3ae86b8d2419b7f.tar.bz2
scummvm-rg350-d3e3eca6a30d8aa9f23b1811b3ae86b8d2419b7f.zip
SCI: Fix Mac icon bar vertical positioning
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/maciconbar.cpp4
-rw-r--r--engines/sci/graphics/screen.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp
index 81e863db34..77491aa995 100644
--- a/engines/sci/graphics/maciconbar.cpp
+++ b/engines/sci/graphics/maciconbar.cpp
@@ -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();
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 6a045f1e8b..a0f402f833 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -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